Skip to content

TagSpaces is an offline, open source, document manager with tagging support

e2e TST4901 and KanBan fix

sytolkf30486dea823
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 2e6f9294d..4177ccbd9 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,17 +1,17 @@
{
"name": "tagspaces",
- "version": "6.4.11",
+ "version": "6.4.12",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "6.4.11",
+ "version": "6.4.12",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.192",
+ "@tagspaces/extensions": "1.0.193",
"@tagspaces/tagspaces-common-node": "4.5.86",
"@tagspaces/tagspaces-ws": "4.5.86",
"sharp": "0.32.6",
@@ -147,9 +147,9 @@
}
},
"node_modules/@tagspaces/extensions": {
- "version": "1.0.192",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.192.tgz",
- "integrity": "sha512-BFWl+0l97+pBpgokIw4BEjTJh+4KP7BkK+ROzeVDwighrbG6HOqLsDmhmscEyKs25uSm6CC6pOaZphNusvZEzg==",
+ "version": "1.0.193",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.193.tgz",
+ "integrity": "sha512-VKSW6TXhcc26n3ZMcfAcLwcxL7I+lezFd7uIvuFD4wRnHQkZXaR/DMcOm9EYbZIdGRvOKFuHlZ4XvP/Os4rIZw==",
"dependencies": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
@@ -1881,9 +1881,9 @@
}
},
"@tagspaces/extensions": {
- "version": "1.0.192",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.192.tgz",
- "integrity": "sha512-BFWl+0l97+pBpgokIw4BEjTJh+4KP7BkK+ROzeVDwighrbG6HOqLsDmhmscEyKs25uSm6CC6pOaZphNusvZEzg==",
+ "version": "1.0.193",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.193.tgz",
+ "integrity": "sha512-VKSW6TXhcc26n3ZMcfAcLwcxL7I+lezFd7uIvuFD4wRnHQkZXaR/DMcOm9EYbZIdGRvOKFuHlZ4XvP/Os4rIZw==",
"requires": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
diff --git a/tests/e2e/hook.js b/tests/e2e/hook.js
index 43d1aa809..62a0a29f6 100644
--- a/tests/e2e/hook.js
+++ b/tests/e2e/hook.js
@@ -2,7 +2,11 @@
import pathLib from 'path';
import fse from 'fs-extra';
import os from 'os';
-import { refreshS3testData, uploadFile } from '../s3rver/S3DataRefresh';
+import {
+ createDir,
+ refreshS3testData,
+ uploadFile,
+} from '../s3rver/S3DataRefresh';
// Spectron API https://github.com/electron/spectron
// Webdriver.io http://webdriver.io/api.html
@@ -377,3 +381,31 @@ export async function createLocalFile(
console.error(err);
}
}
+
+export async function createLocalFolder(
+ testDataDir,
+ folderName = 'empty_local_folder',
+ rootFolder = 'empty_folder',
+) {
+ const folderPath = pathLib.join(testDataDir, rootFolder, folderName);
+ try {
+ await fse.mkdir(folderPath);
+ console.log('Folder created! ' + folderPath);
+ } catch (err) {
+ console.error(err);
+ }
+}
+
+export async function createFolderS3(
+ folderName = 'empty_local_folder',
+ rootFolder = 'empty_folder',
+) {
+ const folderPath = pathLib.join(rootFolder, folderName);
+
+ try {
+ await createDir(folderPath);
+ console.log('Folder created! ' + folderPath);
+ } catch (err) {
+ console.error(err);
+ }
+}
diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.js
index 9764cfad8..f3fb10a6c 100644
--- a/tests/e2e/perspective-kanban.pw.e2e.js
+++ b/tests/e2e/perspective-kanban.pw.e2e.js
@@ -13,10 +13,18 @@ import {
expectElementExist,
getGridFileSelector,
isDisplayed,
+ openFolder,
setPerspectiveSetting,
takeScreenshot,
} from './general.helpers';
-import { startTestingApp, stopApp } from './hook';
+import {
+ createFileS3,
+ createFolderS3,
+ createLocalFile,
+ createLocalFolder,
+ startTestingApp,
+ stopApp,
+} from './hook';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../src/renderer/services/test';
@@ -63,6 +71,33 @@ test.beforeEach(async ({ isMinio, isS3, testDataDir }) => {
});
test.describe('TST49 - Perspective KanBan', () => {
+ test('TST4901 - Folder which is opened in kanban for the first time []', async ({
+ isS3,
+ testDataDir,
+ }) => {
+ // Open max 3 sub-folders as columns on fresh folder
+ if (isS3) {
+ await createFolderS3('test_kanban_column1');
+ await createFolderS3('test_kanban_column2');
+ await createFolderS3('test_kanban_column3');
+ await createFolderS3('test_kanban_column4');
+ } else {
+ await createLocalFolder(testDataDir, 'test_kanban_column1');
+ await createLocalFolder(testDataDir, 'test_kanban_column2');
+ await createLocalFolder(testDataDir, 'test_kanban_column3');
+ await createLocalFolder(testDataDir, 'test_kanban_column4');
+ }
+ await clickOn('[data-tid=openGridPerspective]');
+ await openFolder('empty_folder');
+ await clickOn('[data-tid=openKanbanPerspective]');
+ await expectElementExist(
+ '[data-tid=kanbanSettingsDialogOpenTID]',
+ true,
+ 5000,
+ );
+ await expectElementExist('[data-tid=test_kanban_column1]', true, 50000);
+ });
+
test('TST4909 - move with copy/move file dialog [web,minio,electron,_pro]', async () => {
const fileName = 'sample.bmp';
diff --git a/tests/s3rver/S3DataRefresh.js b/tests/s3rver/S3DataRefresh.js
index bc571a1d3..d31924a4c 100644
--- a/tests/s3rver/S3DataRefresh.js
+++ b/tests/s3rver/S3DataRefresh.js
@@ -150,6 +150,30 @@ function uploadFile(filePath, content = undefined) {
return Promise.reject(err);
}
}
+function createDir(dirPath) {
+ const key = path
+ .relative(directoryPath, dirPath)
+ .replace(/\\/g, '/')
+ .replace(/\/?$/, '/'); // Ensure trailing slash
+
+ const params = {
+ Bucket: bucketName,
+ Key: key,
+ Body: '', // S3 requires a body, even if it's an empty string
+ };
+
+ const s3Client = getS3Client();
+
+ return s3Client
+ .send(new PutObjectCommand(params))
+ .then(() => {
+ console.log(`Created directory-like key ${bucketName}/${key}`);
+ })
+ .catch((err) => {
+ console.error(`Error creating S3 'directory' ${dirPath}:`, err);
+ return Promise.reject(err);
+ });
+}
function uploadTestDirectory(dirPath) {
try {
@@ -170,5 +194,6 @@ module.exports = {
uploadTestDirectory,
refreshS3testData,
uploadFile,
+ createDir,
getS3File,
};