Skip to content

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

e2e fix

sytolk1b97db41698d
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index c77dd36a7..25b8e0ecd 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -108,7 +108,12 @@ export function orderDirectories(
) {
// if (sortBy === 'custom') {
try {
- if (metaArray && metaArray.length > 0) {
+ if (
+ directories &&
+ directories.length > 0 &&
+ metaArray &&
+ metaArray.length > 0
+ ) {
const arrLength = directories.length;
directories.sort((a, b) => {
let indexA = metaArray.findIndex(
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 921320b60..e683f2937 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -887,6 +887,27 @@ export async function setSettings(selector, click = false) {
await clickOn('[data-tid=closeSettingsDialog]');
}
+export async function setPerspectiveSetting(
+ perspective,
+ selector,
+ isChecked = true,
+ isDefault = true,
+) {
+ await clickOn('[data-tid=' + perspective + 'SettingsDialogOpenTID]');
+ if (isChecked) {
+ await global.client.check(selector + ' input');
+ expect(await global.client.isChecked(selector + ' input')).toBeTruthy();
+ } else {
+ await global.client.uncheck(selector + ' input');
+ expect(await global.client.isChecked(selector + ' input')).not.toBeTruthy();
+ }
+ if (isDefault) {
+ await clickOn('[data-tid=defaultSettings]');
+ } else {
+ await clickOn('[data-tid=directorySettings]');
+ }
+}
+
export async function checkSettings(
selector,
isChecked = true,
diff --git a/tests/e2e/perspective-kanban.pw.e2e.js b/tests/e2e/perspective-kanban.pw.e2e.js
index 1de7ab286..1b773be6e 100644
--- a/tests/e2e/perspective-kanban.pw.e2e.js
+++ b/tests/e2e/perspective-kanban.pw.e2e.js
@@ -14,6 +14,7 @@ import {
expectElementExist,
getGridFileSelector,
isDisplayed,
+ setPerspectiveSetting,
takeScreenshot,
} from './general.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
@@ -72,9 +73,12 @@ test.beforeEach(async () => {
test.describe('TST49 - Perspective KanBan', () => {
test('TST4909 - move with copy/move file dialog [web,minio,electron,_pro]', async () => {
const fileName = 'sample.bmp';
- if (await isDisplayed('[data-tid=showFolderContentTID]')) {
- await clickOn('[data-tid=showFolderContentTID]');
- }
+
+ await setPerspectiveSetting(
+ 'kanban',
+ '[data-tid=kanbanPerspectiveToggleShowFolderContent]',
+ );
+
await expectElementExist(getGridFileSelector(fileName), true, 8000);
await openContextEntryMenu(
getGridFileSelector(fileName),
@@ -92,7 +96,14 @@ test.describe('TST49 - Perspective KanBan', () => {
getGridFileSelector('empty_folder'),
'openDirectory',
);
- await expectElementExist(getGridFileSelector(fileName), true, 5000);
+ /*
+ todo fileName not always show in KanBan empty_folder dir content is hidden -> hideFolderContentTID must be clicked on
+ if (await isDisplayed('[data-tid=showFolderContentTID]')) {
+ await clickOn('[data-tid=showFolderContentTID]');
+ }*/
+ await clickOn('[data-tid=openDefaultPerspective]');
+ await expectElementExist(getGridFileSelector(fileName), true, 55000);
+ await clickOn('[data-tid=openKanbanPerspective]');
});
test('TST4910 - prev/next button [web,electron,_pro]', async () => {