TagSpaces is an offline, open source, document manager with tagging support
Tsn refactoring e2e v4 (#1338)
mladensap16c1efc67a5e
diff --git a/tests/e2e/extensions/editor-html.spec.js b/tests/e2e/extensions/editor-html.spec.jsindex f58f08eb7..97a6ffdc7 100644--- a/tests/e2e/extensions/editor-html.spec.js+++ b/tests/e2e/extensions/editor-html.spec.js@@ -1,7 +1,7 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from '../hook';-import { searchEngine } from '../search.spec';-import { openFile } from '../test-utils.spec';+import { searchEngine } from '../search.helpers';+import { openFile } from '../test-utils';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from '../location.e2e';const extButton = '/div[1]/div[2]/button';diff --git a/tests/e2e/extensions/editor-json.spec.js b/tests/e2e/extensions/editor-json.spec.jsindex 270715177..c489a26f7 100644--- a/tests/e2e/extensions/editor-json.spec.js+++ b/tests/e2e/extensions/editor-json.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/editor-text.spec.js b/tests/e2e/extensions/editor-text.spec.jsindex 500ca6a4f..6b8f038db 100644--- a/tests/e2e/extensions/editor-text.spec.js+++ b/tests/e2e/extensions/editor-text.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-epub.spec.js b/tests/e2e/extensions/viewer-epub.spec.jsindex c6407c437..0fdba615a 100644--- a/tests/e2e/extensions/viewer-epub.spec.js+++ b/tests/e2e/extensions/viewer-epub.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-html.spec.js b/tests/e2e/extensions/viewer-html.spec.jsindex 1d565782b..81bc2ab2d 100644--- a/tests/e2e/extensions/viewer-html.spec.js+++ b/tests/e2e/extensions/viewer-html.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-image.spec.js b/tests/e2e/extensions/viewer-image.spec.jsindex 9b424616a..fef828cbd 100644--- a/tests/e2e/extensions/viewer-image.spec.js+++ b/tests/e2e/extensions/viewer-image.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-markdown.spec.js b/tests/e2e/extensions/viewer-markdown.spec.jsindex 689e9a7b9..e61660512 100644--- a/tests/e2e/extensions/viewer-markdown.spec.js+++ b/tests/e2e/extensions/viewer-markdown.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-mhtml.spec.js b/tests/e2e/extensions/viewer-mhtml.spec.jsindex b259a9af6..ca46605ac 100644--- a/tests/e2e/extensions/viewer-mhtml.spec.js+++ b/tests/e2e/extensions/viewer-mhtml.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-pdf.spec.js b/tests/e2e/extensions/viewer-pdf.spec.jsindex 22046aba8..da4a013a0 100644--- a/tests/e2e/extensions/viewer-pdf.spec.js+++ b/tests/e2e/extensions/viewer-pdf.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-text.spec.js b/tests/e2e/extensions/viewer-text.spec.jsindex 1b27cab3a..6a3fe6eea 100644--- a/tests/e2e/extensions/viewer-text.spec.js+++ b/tests/e2e/extensions/viewer-text.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-url.spec.js b/tests/e2e/extensions/viewer-url.spec.jsindex c74f4e3e7..ea87666f9 100644--- a/tests/e2e/extensions/viewer-url.spec.js+++ b/tests/e2e/extensions/viewer-url.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/extensions/viewer-zip.spec.js b/tests/e2e/extensions/viewer-zip.spec.jsindex 466aee84e..682c0165f 100644--- a/tests/e2e/extensions/viewer-zip.spec.js+++ b/tests/e2e/extensions/viewer-zip.spec.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay, clearLocalStorage } from './hook';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import { openFile } from './perspective.spec';import { createLocation, openLocation, aboutDialogExt, defaultLocationPath, defaultLocationName, perspectiveGridTable } from './location.spec';diff --git a/tests/e2e/fileopener.e2e.js b/tests/e2e/fileopener.e2e.jsindex c9e22d1ac..9920bde92 100644--- a/tests/e2e/fileopener.e2e.js+++ b/tests/e2e/fileopener.e2e.js@@ -20,8 +20,8 @@ import {AddRemovePropertiesTags,getPropertiesFileName} from './file.properties.helpers';-import { searchEngine } from './search.spec';-import { openContextEntryMenu } from './test-utils.spec';+import { searchEngine } from './search.helpers';+import { openContextEntryMenu } from './test-utils';describe('TST08 - File folder properties', () => {beforeEach(async () => {@@ -36,7 +36,7 @@ describe('TST08 - File folder properties', () => {await closeFileProperties();});- it('TST0801 - Arrow keys select next prev file (keybindings) [TST0801,web,minio,electron]', async () => {+ it('TST0801 - Arrow keys select next prev file (keybindings) [web,minio,electron]', async () => {const firstFileName = await getGridFileName(0);// open fileProperties@@ -58,7 +58,7 @@ describe('TST08 - File folder properties', () => {expect(propsPrevFileName).toBe(propsFileName);});- it('TST0802 - Open next file buttons [TST0802,web,minio,electron]', async () => {+ it('TST0802 - Open next file buttons [web,minio,electron]', async () => {const firstFileName = await getGridFileName(0);// open fileProperties@@ -76,7 +76,7 @@ describe('TST08 - File folder properties', () => {expect(secondFileName).toBe(propsNextFileName);});- it('TST0803 - Open previous files buttons [TST0803,web,minio,electron]', async () => {+ it('TST0803 - Open previous files buttons [web,minio,electron]', async () => {const firstFileName = await getGridFileName(0);// open fileProperties@@ -95,7 +95,7 @@ describe('TST08 - File folder properties', () => {});// TODO the last button full width is not visible (maybe its need to add scroll)- it('TST0804 - Open file in full width [TST0804]', async () => {+ it.skip('TST0804 - Open file in full width [electron]', async () => {// open filePropertiesawait clickOn(selectorFile);await global.client.pause(500);@@ -104,7 +104,7 @@ describe('TST08 - File folder properties', () => {await expectElementExist('[data-tid=folderContainerTID]', false);});- it('TST0805 - Rename opened file [TST0805,web,minio,electron]', async () => {+ it('TST0805 - Rename opened file [web,minio,electron]', async () => {const newTile = 'fileRenamed.txt';await searchEngine('txt');// open fileProperties@@ -129,7 +129,9 @@ describe('TST08 - File folder properties', () => {expect(propsOldFileName).toBe(propsFileName);});- it('TST0807 - Rename opened folder [TST0807, electron]', async () => {+ it.skip('TST0806 - Download file [Electron, manual]', async () => {});++ it('TST0807 - Rename opened folder [electron]', async () => {const newTile = 'folderRenamed';// open folderPropertiesawait openContextEntryMenu(selectorFolder, 'showProperties');@@ -151,7 +153,7 @@ describe('TST08 - File folder properties', () => {expect(propsOldFileName).toBe(propsFolderName);});- it('TST0808 - Add and remove tags to a file (file names) [TST0808,web,minio,electron]', async () => {+ it('TST0808 - Add and remove tags to a file (file names) [web,minio,electron]', async () => {// await searchEngine('bmp');// open filePropertiesawait clickOn(selectorFile);@@ -161,7 +163,7 @@ describe('TST08 - File folder properties', () => {await AddRemovePropertiesTags(['test-tag1', 'test-tag2']);});- it('TST0809 - Add and remove tag to a file (sidecar files) [TST0809,web,minio,electron]', async () => {+ it('TST0809 - Add and remove tag to a file (sidecar files) [web,minio,electron]', async () => {await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]');// await searchEngine('bmp');// open fileProperties@@ -171,12 +173,20 @@ describe('TST08 - File folder properties', () => {await AddRemovePropertiesTags(['test-tag1', 'test-tag2']);});- it('TST3002 - Add and remove tag to a folder [TST3002,web,minio,electron]', async () => {+ it.skip('TST0810 - Tag file drag&drop in file opener [Electron, manual]', async () => {});++ it('TST3002 - Add and remove tag to a folder [web,minio,electron]', async () => {await openContextEntryMenu(selectorFolder, 'showProperties');await AddRemovePropertiesTags(['test-tag1', 'test-tag2']);});- it('TST0812 - Reload file [TST0812,web,minio,electron]', async () => {+ it.skip('TST3004 - Folder Tagging [Pro]', async () => {});++ it.skip('TST3001 - Description for files [Pro]', async () => {});++ it.skip('TST3005 - Description for folders [Pro]', async () => {});++ it('TST0812 - Reload file [web,minio,electron]', async () => {// open filePropertiesawait clickOn(selectorFile);//Toggle Properties@@ -185,7 +195,7 @@ describe('TST08 - File folder properties', () => {// TODO externally change the file to check if its reloaded});- it('TST0813 - Delete file [TST0813,web,minio,electron]', async () => {+ it('TST0813 - Delete file [web,minio,electron]', async () => {await createTxtFile();await searchEngine('note');@@ -207,7 +217,7 @@ describe('TST08 - File folder properties', () => {expect(propsFileName).not.toBe(firstFileName);});- it('TST0814 - Open file fullscreen and exit with close button [TST0803,web,minio,electron]', async () => {+ it('TST0814 - Open file fullscreen and exit with close button [ web,minio,electron]', async () => {// open filePropertiesawait clickOn(selectorFile);await clickOn('[data-tid=fileContainerSwitchToFullScreen]');@@ -215,4 +225,24 @@ describe('TST08 - File folder properties', () => {await clickOn('[data-tid=fullscreenTID]');await expectElementExist('[data-tid=fullscreenTID]', false);});++ it.skip('TST0815 - Test opening file, while TS is in fullscreen(F11) [Electron, manual]', async () => {});++ it.skip('TST0817 - Open file fullscreen and exit with ESC button [Electron]', async () => {});++ it.skip('TST0818 - Open in new tab in the web version [Web]', async () => {});++ it.skip('TST0819 - Open file natively [Electron, manual]', async () => {});++ it.skip('TST0820 - Open containing folder [Electron, manual]', async () => {});++ it.skip('TST0821 - Toggle File Properties [Electron]', async () => {});++ it.skip('TST0822 - Open Folder Properties [Electron]', async () => {});++ it.skip('TST0823 - Show thumbnail in the properties if available [Pro]', async () => {});++ it.skip('TST0824 - Change file thumbnail / Reset thumbnail [Pro]', async () => {});++ it.skip('TST0825 - Change folder thumbnail / Reset thumbnail [Pro]', async () => {});});diff --git a/tests/e2e/filetypes.spec.js b/tests/e2e/filetypes.spec.jsdeleted file mode 100644index 6f974bafe..000000000--- a/tests/e2e/filetypes.spec.js+++ /dev/null@@ -1,46 +0,0 @@-/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { clearLocalStorage, delay } from './hook';-import {- createLocation,- defaultLocationPath,- openLocation-} from './location.helpers';-import { openSettings } from './general.е2е';--const testLocationName = '' + new Date().getTime();--describe('TST12 - Settings file type:', async () => {- beforeEach(async () => {- await clearLocalStorage();- await delay(500);- await createLocation(defaultLocationPath, testLocationName);- await delay(500);- await openLocation(testLocationName);- await delay(500);- await openSettings('fileTypeSettingsDialog');- await delay(500);- });-- it('TST1201 - Add file type', async () => {- // TODO add file type- await global.client.waitForVisible(- '[data-tid=settingsFileTypes_addFileType]'- );- await global.client.click('[data-tid=settingsFileTypes_addFileType]');- });-- it('TST1202 - Remove file type', async () => {- // TODO remove file type- await global.client.waitForVisible(- '[data-tid=settingsFileTypes_remove_bmp]'- );- await global.client.click('[data-tid=settingsFileTypes_remove_bmp]');- const removeExt = await global.client.element(- '[data-tid=settingsFileTypes_remove_bmp]'- );- await delay(500);- expect(removeExt.selector).not.toBe(- '[data-tid=settingsFileTypes_remove_bmp]'- );- });-});diff --git a/tests/e2e/folder.e2e.js b/tests/e2e/folder.e2e.jsindex 9f9f31e20..a99bbe695 100644--- a/tests/e2e/folder.e2e.js+++ b/tests/e2e/folder.e2e.js@@ -17,7 +17,7 @@ import {setSettings,doubleClickOn} from './general.helpers';-import { renameFolder } from './test-utils.spec';+import { renameFolder } from './test-utils';// export const firstFile = '/span';// export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';@@ -35,7 +35,7 @@ describe('TST01 - Folder management [electron]', () => {});// TODO minio- it('TST0101 - Create subfolder [TST0101,electron]', async () => {+ it('TST0101 - Create subfolder [electron]', async () => {const testFolder = await createNewDirectory();await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');@@ -47,7 +47,7 @@ describe('TST01 - Folder management [electron]', () => {});// TODO minio- it('TST0102 - Reload folder [TST0102,electron]', async () => {+ it('TST0102 - Reload folder [electron]', async () => {const testFolder = await createNewDirectory();await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');await reloadDirectory();@@ -59,8 +59,7 @@ describe('TST01 - Folder management [electron]', () => {);});- // TODO- it('TST0103 - Rename folder [TST0103]', async () => {+ it.skip('TST0103 - Rename folder [TODO]', async () => {const testFolder = await createNewDirectory();await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');const newDirectoryName = await renameFolder();@@ -74,7 +73,7 @@ describe('TST01 - Folder management [electron]', () => {);*/});- it('TST0104 - Delete empty folder [TST0104, electron]', async () => {+ it('TST0104 - Delete empty folder [electron]', async () => {await setSettings('[data-tid=settingsSetUseTrashCan]');await global.client.pause(500);const testFolder = await createNewDirectory();@@ -87,7 +86,19 @@ describe('TST01 - Folder management [electron]', () => {);});- it('TST0106 - Show folder tags [TST0106]', async () => {+ it.skip('TST0105 - Show folder tags [Electron, TODO]', async () => {});++ it.skip('TST0106 - Show folder tags [TODO]', async () => {// await createNewDirectory();});++ it.skip('TST0107 - Show in file manager [Electron, manual]', async () => {});++ it.skip('TST0108 - Show directory properties [Electron, TODO]', async () => {});++ it.skip('TST0109 - Delete non empty folder by disabled trashcan should not be possible [Electron, TODO]', async () => {});++ it.skip('TST0110 - Delete not empty folder to trashcan [Electron, TODO]', async () => {});++ it.skip('TST0111 - Open parent directory [Electron, TODO]', async () => {});});diff --git a/tests/e2e/folder.spec.js b/tests/e2e/folder.spec.jsdeleted file mode 100644index 08912f4d0..000000000--- a/tests/e2e/folder.spec.js+++ /dev/null@@ -1,176 +0,0 @@-/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { delay } from './hook';-import {- openFile,- checkFilenameForExist,- openDirectoryMenu,- openContextEntryMenu,- perspectiveGridTable,- firstFile,- firstFileName-} from './test-utils.spec';-import {- createLocation,- openLocation,- defaultLocationPath,- defaultLocationName-} from './location.helpers';-import { searchEngine } from './search.spec';--// const folderName = "test-data";-const testFolder = 'testFolder';-const currentDir = 'newDirectory';-const subDir = 'subDir';-const lastSubFolder = 'search';-// const renamedFolder = "renamedFolder";--describe('TST01+TST02 - Folder tests', () => {- beforeEach(async () => {- await delay(1000);- await createLocation(defaultLocationPath, defaultLocationName, true);- await delay(1000);- await openLocation(defaultLocationName);- await delay(1000);- });-- it('TST0101 - Should create a folder', async () => {- await openDirectoryMenu(defaultLocationName);- await global.client.waitForVisible('[data-tid=newSubDirectory]');- await global.client.click('[data-tid=newSubDirectory]');- await delay(1500);- // set new dir name- await global.client- .waitForVisible('[data-tid=directoryName] input')- .keys('[data-tid=directoryName] input', testFolder);- await delay(500);- await global.client.waitForVisible('[data-tid=confirmCreateNewDirectory]');- await global.client.click('[data-tid=confirmCreateNewDirectory]');- // should find the folder with the given name in the UI- await checkFilenameForExist(testFolder);- await searchEngine(testFolder);- await openFile(perspectiveGridTable, firstFile);- await openDirectoryMenu('[data-tid=deleteDirectory]');- });-- it('TST0201 - Should create a folder in alternative navigation', async () => {- await openDirectoryMenu('newSubDirectory');- // set new dir name- await delay(1500);- await global.client.keys('\uE004');- // await global.client.waitUntil(() =>- // await global.client.waitForVisible('[data-tid=directoryName]')- // .setValue('[data-tid=directoryName]', testFolder);- // 500, 'expected text to be different after 5ms');- await delay(1500);- await global.client.$('[data-tid=directoryName] input').keys(testFolder);- await global.client.keys('Tab');- await global.client.keys('Tab');- await global.client.keys('Enter');- // await delay(1500);- // await global.client.waitForVisible('[data-tid=confirmCreateNewDirectory]');- // await delay(1500);- // await global.client.click('[data-tid=confirmCreateNewDirectory]');- // await global.client.$('[data-tid=confirmCreateNewDirectory]').click();- // should find the folder with the given name in the UI- await delay(5000);- await checkFilenameForExist(testFolder);- await delay(1500);- await searchEngine(testFolder);- await delay(1500);- await openFile(perspectiveGridTable, firstFile);- await delay(1500);- await openDirectoryMenu('deleteDirectory');- });-- it('TST0102 - Should reload a folder', async () => {- await openDirectoryMenu('reloadDirectory');- await delay(500);- const dirName = await global.client- .waitForVisible(perspectiveGridTable + firstFile)- .getText(perspectiveGridTable + firstFile);- expect(dirName).toContain(subDir);- });-- it('TST0203 - Should reload folder in alternative navigation', async () => {- await openDirectoryMenu('reloadDirectory');- const folder = await global.client.getText(- '[data-tid=folderContainerOpenDirMenu]'- );- await delay(500);- expect(folder).toContain(defaultLocationName.toUpperCase());- });-- describe('Rename folder', async () => {- beforeEach(async () => {- await searchEngine(currentDir);- });-- it('TST0103 - Should rename a folder', async () => {- await openContextEntryMenu(- perspectiveGridTable + firstFile,- 'renameDirectory'- );- await delay(500);- await global.client- .waitForVisible('[data-tid=renameDirectoryDialogInput] input')- .setValue('[data-tid=renameDirectoryDialogInput] input', testFolder);- await delay(500);- await global- .clientwaitForVisible('[data-tid=confirmRenameDirectory]')- .click('[data-tid=confirmRenameDirectory]');- await delay(500);- await searchEngine(currentDir);- await global.client- .waitForVisible('[data-tid=renameDirectoryDialogInput] input')- .setValue('[data-tid=renameDirectoryDialogInput] input', currentDir);- await delay(500);- await global- .clientwaitForVisible('[data-tid=confirmRenameDirectory]')- .click('[data-tid=confirmRenameDirectory]');- });-- it('TST0202 - Should rename a folder from the alternative navigation', async () => {- await openDirectoryMenu('renameDirectory');- await delay(500);- await global.client- .waitForVisible('[data-tid=directoryName] input')- .setValue('[data-tid=directoryName] input', testFolder);- await delay(5000);- // // should find the new name of the folder- // .waitForVisible('//*[@id="locationContent"]/div/div[2]/div[1]/button[2]')- // .getText('//*[@id="locationContent"]/div/div[2]/div[1]/button[2]')- // .should.eventually.equals(renamedFolder+'M')- // //.waitForVisible('#perspectiveListContainer').should.eventually.exist;- });- });-- it('TST0105 - Open sub folder', async () => {- await searchEngine(currentDir);- await openContextEntryMenu(- perspectiveGridTable + firstFile,- 'openDirectory'- );- await delay(500);- const dirName = await global.client- .waitForVisible(perspectiveGridTable + firstFile)- .getText(perspectiveGridTable + firstFile);- expect(dirName).toContain(subDir);- });-- it('TST0111 - Open parent folder from the alternative navigation', async () => {- await openDirectoryMenu('openParentDirectory');- await delay(500);- const dirName = await global.client- .waitForVisible(perspectiveGridTable + firstFile)- .getText(perspectiveGridTable + firstFile);- expect(dirName).toContain(subDir);- });-- it('TST0104 - Delete Folder', async () => {- // await searchEngine(currentDir);- // await openContextEntryMenu(perspectiveGridTable + firstFile, 'openDirectory');- // await delay(500);- // const dirName = await global.client.waitForVisible(perspectiveGridTable + firstFile).getText(perspectiveGridTable + firstFile);- // expect(dirName).toContain(subDir);- });-});diff --git a/tests/e2e/general.e2e.js b/tests/e2e/general.e2e.jsindex e5265c6b7..fe3e6ec75 100644--- a/tests/e2e/general.e2e.js+++ b/tests/e2e/general.e2e.js@@ -25,7 +25,7 @@ import {setSettings,doubleClickOn} from './general.helpers';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';export const firstFile = '/span';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex 236139983..643aea648 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { delay } from './hook';-import { firstFile } from './test-utils.spec';+import { delay, clearLocalStorage } from './hook';+import { firstFile } from './test-utils';export const defaultLocationPath ='./testdata-tmp/file-structure/supported-filestypes';@@ -13,6 +13,7 @@ export const selectorFolder = '//*[@data-tid="perspectiveGridFileTable"]/div';// const newHTMLFileName = 'newHTMLFile.html';const testFolder = 'testFolder';+const testLocationName = '' + new Date().getTime();export async function clickOn(selector, options = {}) {const element = await global.client.$(selector);@@ -641,3 +642,73 @@ export async function openCloseAboutDialog(title) {await closeAboutDialogButton.click();await delay(500);}++export async function openSettings(selectedTab) {+ await global.client.waitForVisible('[data-tid=settings]');+ await global.client.click('[data-tid=settings]');+ if (selectedTab) {+ await global.client.waitForVisible('[data-tid=' + selectedTab + ']');+ await global.client.click('[data-tid=' + selectedTab + ']');+ }+}++describe('TST07 - General', () => {+ beforeEach(async () => {+ await clearLocalStorage();+ await delay(500);+ });++ it.skip('TST0701 - Open About TagSpaces', async () => {+ await global.client.waitForVisible('[data-tid=aboutTagSpaces]');+ await global.client.click('[data-tid=aboutTagSpaces]');+ await global.client.waitForVisible('[data-tid=closeAboutDialog]');+ await global.client.click('[data-tid=closeAboutDialog]');+ });++ it.skip('TST0705 - Open Settings Dialog', async () => {+ await global.client.waitForVisible('[data-tid=settings]');+ await global.client.click('[data-tid=settings]');+ await checkForIdExist('settingsDialog');+ await global.client.waitForVisible('[data-tid=closeSettingsDialog]');+ await global.client.click('[data-tid=closeSettingsDialog]');+ });++ it.skip('TST07** - Change theme color', async () => {+ await global.client.waitForVisible('[data-tid=settings]');+ await global.client.click('[data-tid=settings]');+ await delay(500);+ // activate dark theme+ await global.client.waitForVisible('[data-tid=settingsSetCurrentTheme]');+ await global.client.selectByValue(+ '[data-tid=settingsSetCurrentTheme]/div/select',+ 'dark'+ );+ await delay(500);+ // const style = await global.client.getAttribute('//button[contains(., "done")]', 'style');+ // await delay(500);+ // expect(style).toContain('rgb(208, 107, 100)');+ // await global.client.waitForVisible('[data-tid=closeSettingsDialog]');+ // await global.client.click('[data-tid=closeSettingsDialog]');+ });++ /* it('TST10** - Desktop Mode', async () => {+ await createLocation(defaultLocationPath, testLocationName, false);+ await checkForIdExist('folderContainerLocationChooser');+ await delay(500);+ await global.client.waitForVisible('[data-tid=settings]');+ await global.client.click('[data-tid=settings]');+ await global.client.waitForVisible('[data-tid=settingsSetDesktopMode]');+ await global.client.click('[data-tid=settingsSetDesktopMode]');+ await delay(2000);+ await global.client.waitForVisible('[data-tid=closeSettingsDialog]');+ await global.client.click('[data-tid=closeSettingsDialog]');+ // set desktop mode and check for desktop text / Location Chooser bottom in Toolbar+ const isDesktopMode = await global.client.element('[data-tid=folderContainerLocationChooser]');+ await delay(500);+ expect(isDesktopMode.selector).not.toBe('[data-tid=folderContainerLocationChooser]');+ }); */++ // it('TST1003 - Checkbox in the settings to open the tag library on startup', async () => {+ //+ // });+});diff --git a/tests/e2e/general.spec.js b/tests/e2e/general.spec.jsdeleted file mode 100644index fa27b88a2..000000000--- a/tests/e2e/general.spec.js+++ /dev/null@@ -1,75 +0,0 @@-/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { delay, clearLocalStorage } from './hook';-// import { createLocation, defaultLocationPath, checkForIdExist } from './location.spec';--const testLocationName = '' + new Date().getTime();--export async function openSettings(selectedTab) {- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- if (selectedTab) {- await global.client.waitForVisible('[data-tid=' + selectedTab + ']');- await global.client.click('[data-tid=' + selectedTab + ']');- }-}--describe('TST07 - General', () => {- beforeEach(async () => {- await clearLocalStorage();- await delay(500);- });-- it('TST0701 - Open About TagSpaces', async () => {- await global.client.waitForVisible('[data-tid=aboutTagSpaces]');- await global.client.click('[data-tid=aboutTagSpaces]');- await global.client.waitForVisible('[data-tid=closeAboutDialog]');- await global.client.click('[data-tid=closeAboutDialog]');- });-- it('TST0705 - Open Settings Dialog', async () => {- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await checkForIdExist('settingsDialog');- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');- });-- it('TST07** - Change theme color', async () => {- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await delay(500);- // activate dark theme- await global.client.waitForVisible('[data-tid=settingsSetCurrentTheme]');- await global.client.selectByValue(- '[data-tid=settingsSetCurrentTheme]/div/select',- 'dark'- );- await delay(500);- // const style = await global.client.getAttribute('//button[contains(., "done")]', 'style');- // await delay(500);- // expect(style).toContain('rgb(208, 107, 100)');- // await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- // await global.client.click('[data-tid=closeSettingsDialog]');- });-- /* it('TST10** - Desktop Mode', async () => {- await createLocation(defaultLocationPath, testLocationName, false);- await checkForIdExist('folderContainerLocationChooser');- await delay(500);- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await global.client.waitForVisible('[data-tid=settingsSetDesktopMode]');- await global.client.click('[data-tid=settingsSetDesktopMode]');- await delay(2000);- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');- // set desktop mode and check for desktop text / Location Chooser bottom in Toolbar- const isDesktopMode = await global.client.element('[data-tid=folderContainerLocationChooser]');- await delay(500);- expect(isDesktopMode.selector).not.toBe('[data-tid=folderContainerLocationChooser]');- }); */-- // it('TST1003 - Checkbox in the settings to open the tag library on startup', async () => {- //- // });-});diff --git a/tests/e2e/keybindings.spec.js b/tests/e2e/keybindings.spec.jsdeleted file mode 100644index 90e513d5e..000000000--- a/tests/e2e/keybindings.spec.js+++ /dev/null@@ -1,102 +0,0 @@-/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { delay } from './hook';-import {- createLocation,- checkForIdExist,- defaultLocationPath-} from './location.helpers';-import { openSettings } from './general.spec';-import { searchEngine, testFileInSubDirectory } from './search.spec';-import {- checkFilenameForExist,- firstFile,- openDirectoryMenu,- openFile,- perspectiveGridTable-} from './test-utils.spec';--const testLocationName = '' + new Date().getTime();--describe('TST13 - Settings Key Bindings:', async () => {- beforeEach(async () => {- await delay(500);- await createLocation(defaultLocationPath, testLocationName);- await delay(2000);- });-- it('TST1301 - Change key binding', async () => {- await openSettings('keyBindingsSettingsDialog');- // TODO Set the new value of 'Select all files' key binding button to (F8)-- // TODO check the new button (F8)- });-- it('TST1307 - Show next document', async () => {- // TODO show next document - arrow right- // await global.client.keys('ArrowRight')- // TODO show previous document - arrow left- // await global.client.keys('ArrowLeft')- });-- it('TST1312 - Rename file', async () => {- await searchEngine('sample');- await openFile(perspectiveGridTable, firstFile);- await global.client.keys('F2');- await delay(500);- // set new file name- await global.client- .waitForVisible('[data-tid=renameFileDialogInput]')- .setValue('[data-tid=renameFileDialogInput]', 'newFileName');- await delay(500);- await global- .clientwaitForVisible('#confirmRenameFileDialog')- .click('#confirmRenameFileDialog');- await searchEngine('newFileName');- await checkFilenameForExist('newFileName');- // rename the new name to old name- await openFile(perspectiveGridTable, firstFile);- await global.client.keys('F2');- // set new file name- await global.client- .waitForVisible('[data-tid=renameFileDialogInput]')- .setValue('[data-tid=renameFileDialogInput]', 'sample.txt');- await delay(500);- await global- .clientwaitForVisible('#confirmRenameFileDialog')- .click('#confirmRenameFileDialog');- // should find renamed file name- await checkFilenameForExist('sample');- });-- it('TST1313 - Open file', async () => {});-- it('TST1315 - Delete file', async () => {- await openDirectoryMenu('[data-tid=createNewFile]');- // find new created file- await delay(500);- // await searchEngine('newFile');- await openFile(perspectiveGridTable, firstFile);- // TODO check first file- // await global.client.keys('Delete') // key binding Delete- // await global.client.waitForVisible('[data-tid=confirmDeleteFileDialog]').click('[data-tid=confirmDeleteFileDialog]')- // TODO first file should not be with empty file name- // await global.client.waitForVisible(firstFileNameElement)- // await global.client .getText(firstFileNameElement)- });-- it('TST1316 - Show keyboard shortcuts help dialog', async () => {- // TODO should to set current key binding to show keyboard shortcuts help dialog- await global.client.keys('F1');- await delay(500);- await checkForIdExist('keyboardShortCutsDialog');- });-- it('TST13** - Show tag library / Show location', async () => {- await global.client.keys(['Control', '2']);- await delay(500);- await checkForIdExist('keyboardShortCutsDialog');- await global.client.keys(['Control', '1']);- await delay(500);- await checkForIdExist('keyboardShortCutsDialog');- });-});diff --git a/tests/e2e/location.helpers.js b/tests/e2e/location.helpers.jsindex 5860e687c..1dbd6a6dd 100644--- a/tests/e2e/location.helpers.js+++ b/tests/e2e/location.helpers.js@@ -1,6 +1,6 @@/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */import { delay } from './hook';-import { firstFile, openContextEntryMenu } from './test-utils.spec';+import { firstFile, openContextEntryMenu } from './test-utils';import {clickOn,selectorFile,diff --git a/tests/e2e/perspective-grid-right-button.e2e.js b/tests/e2e/perspective-grid-right-button.e2e.jsindex 1c3c340c3..feb8bf146 100644--- a/tests/e2e/perspective-grid-right-button.e2e.js+++ b/tests/e2e/perspective-grid-right-button.e2e.js@@ -12,14 +12,14 @@ import {createMinioLocation,closeLocation} from './location.helpers';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';import {openContextEntryMenu,perspectiveGridTable,firstFile,toContainTID,firstFolder-} from './test-utils.spec';+} from './test-utils';import {addInputKeys,clickOn,@@ -65,7 +65,7 @@ describe('TST50** - Right button on a file', () => {}});*/- test('TST5016 - Open file [TST5016,web,minio,electron]', async () => {+ test('TST5016 - Open file [web,minio,electron]', async () => {//await searchEngine('bmp');await searchEngine('txt');await openContextEntryMenu(@@ -89,7 +89,7 @@ describe('TST50** - Right button on a file', () => {expect(toContainTID(bodyTxt)).toBe(true);});- test('TST5017 - Rename file [TST5017,web,minio,electron]', async () => {+ test('TST5017 - Rename file [web,minio,electron]', async () => {await searchEngine('txt');const oldName = await getFirstFileName();await renameFirstFile(newFileName);@@ -101,7 +101,7 @@ describe('TST50** - Right button on a file', () => {expect(fileName).toContain(oldName);});- test('TST5018 - Delete file [TST5018,web,minio,electron]', async () => {+ test('TST5018 - Delete file [web,minio,electron]', async () => {await createTxtFile();await searchEngine('note'); //select new created file - note[date_created].txt/*let firstFileName = await getGridFileName(0);@@ -115,7 +115,7 @@ describe('TST50** - Right button on a file', () => {expect(firstFileName).toBe(undefined);*/});- test('TST5019 - Rename tag in file [TST5019,web,minio,electron]', async () => {+ test('TST5019 - Rename tag in file [web,minio,electron]', async () => {await searchEngine('desktop');// Select fileawait clickOn(selectorFile);@@ -148,7 +148,7 @@ describe('TST50** - Right button on a file', () => {);});- test('TST5023 - Remove tag from file (tag menu) [TST5023,web,minio,electron]', async () => {+ test('TST5023 - Remove tag from file (tag menu) [web,minio,electron]', async () => {await searchEngine('desktop');// select fileawait clickOn(selectorFile);@@ -161,7 +161,7 @@ describe('TST50** - Right button on a file', () => {await expectTagsExistBySelector(selectorFile, [testTagName], false);});- test('TST5024 - Show files with a given tag (tag menu) [TST5024,web,minio,electron]', async () => {+ test('TST5024 - Show files with a given tag (tag menu) [web,minio,electron]', async () => {//open Option menuawait clickOn('[data-tid=gridPerspectiveOptionsMenu]');//click on hide directories@@ -198,7 +198,7 @@ describe('TST50** - Right button on a file', () => {* TODO web sometimes: stale element reference: stale element reference: element is not attached to the page document* TODO minio sometimes: stale element reference: stale element reference: element is not attached to the page document*/- test('TST5025 - Add - Remove tags (file menu) [TST5025,electron]', async () => {+ test('TST5025 - Add - Remove tags (file menu) [electron]', async () => {await searchEngine('desktop');const tags = [testTagName, testTagName + '2'];// select file@@ -249,7 +249,7 @@ describe('TST50** - Right button on a file', () => {/*** TODO github minio (expected selector to exist=false after 5s)*/- test('TST5028 - Move - Copy file (file menu) [TST5028,electron]', async () => {+ test('TST5028 - Move - Copy file (file menu) [electron]', async () => {// Move file in child folderawait searchEngine('eml');await openContextEntryMenu(@@ -290,7 +290,9 @@ describe('TST50** - Right button on a file', () => {await expectElementExist(selectorFile, false);});- test('TST5033 - Open directory (directory menu) [TST5033,web,minio,electron]', async () => {+ it.skip('TST5029 - Add file from file manager with dnd [Electron, manual]', async () => {});++ test('TST5033 - Open directory (directory menu) [web,minio,electron]', async () => {// open empty_folderawait openContextEntryMenu(perspectiveGridTable + firstFolder,@@ -306,7 +308,7 @@ describe('TST50** - Right button on a file', () => {/*** minio not support rename folder*/- test('TST5034 - Rename directory (directory menu) [TST5034,electron]', async () => {+ test('TST5034 - Rename directory (directory menu) [electron]', async () => {const newDirName = 'new_dir_name';await openContextEntryMenu(perspectiveGridTable + firstFolder,@@ -336,7 +338,7 @@ describe('TST50** - Right button on a file', () => {/*** delete dir is not supported on minio*/- test('TST5035 - Delete directory (directory menu) [TST5035,electron]', async () => {+ test('TST5035 - Delete directory (directory menu) [electron]', async () => {await setSettings('[data-tid=settingsSetUseTrashCan]');await global.client.pause(500);const testFolder = await createNewDirectory('aaa');@@ -353,7 +355,7 @@ describe('TST50** - Right button on a file', () => {);});- test('TST5036 - Open directory properties (directory menu) [TST5036,web,minio,electron]', async () => {+ test('TST5036 - Open directory properties (directory menu) [web,minio,electron]', async () => {await openContextEntryMenu(perspectiveGridTable + firstFolder,'showProperties'@@ -385,7 +387,7 @@ describe('TST50** - Right button on a file', () => {await expectElementExist(selectorFolder, true);});- test('TST5038 - Return directory back [TST5038,web,minio,electron]', async () => {+ test('TST5038 - Return directory back [web,minio,electron]', async () => {await expectElementExist(selectorFolder);//Open folder@@ -396,7 +398,7 @@ describe('TST50** - Right button on a file', () => {await expectElementExist(selectorFolder);});- test('TST5039 - Changing the Perspective View [TST5039,web,minio,electron]', async () => {+ test('TST5039 - Changing the Perspective View [web,minio,electron]', async () => {const grid = await global.client.$('[data-tid=perspectiveGridFileTable]');let gridStyle = await grid.getAttribute('style');diff --git a/tests/e2e/perspective-grid.e2e.js b/tests/e2e/perspective-grid.e2e.jsindex e541b26aa..574987219 100644--- a/tests/e2e/perspective-grid.e2e.js+++ b/tests/e2e/perspective-grid.e2e.js@@ -10,12 +10,8 @@ import {createMinioLocation,getFirstFileName} from './location.helpers';-import { searchEngine } from './search.spec';-import {- perspectiveGridTable,- firstFile,- firstFolder-} from './test-utils.spec';+import { searchEngine } from './search.helpers';+import { perspectiveGridTable, firstFile, firstFolder } from './test-utils';import {addInputKeys,clickOn,@@ -61,7 +57,7 @@ describe('TST50 - Perspective Grid', () => {}});- test('TST5002 - Open file with click [TST5002,web,minio,electron]', async () => {+ test('TST5002 - Open file with click [web,minio,electron]', async () => {await searchEngine('txt'); //testTestFilename);const firstFileName = await getGridFileName(0);await clickOn(perspectiveGridTable + firstFile);@@ -73,7 +69,7 @@ describe('TST50 - Perspective Grid', () => {});// Scenarios for sorting files in grid perspective- describe('TST5003 - Testing sort files in the grid perspective [TST5003,web,minio,electron]', () => {+ describe('TST5003 - Testing sort files in the grid perspective [web,minio,electron]', () => {beforeEach(async () => {await clickOn('[data-tid=gridPerspectiveSortMenu]');await global.client.pause(500);@@ -147,7 +143,7 @@ describe('TST50 - Perspective Grid', () => {});});- test('TST5004 - Select-deselect all files [TST5004,web,minio,electron]', async () => {+ test('TST5004 - Select-deselect all files [web,minio,electron]', async () => {const classNotSelected = await getGridCellClass(0);const classSelected = await selectAllFiles(classNotSelected);@@ -173,7 +169,7 @@ describe('TST50 - Perspective Grid', () => {});// This scenario includes "Add tags" && "Remove tags" to be fulfilled- test('TST5005 - Add tags to the selected files [TST5005,web,minio,electron]', async () => {+ test('TST5005 - Add tags to the selected files [web,minio,electron]', async () => {/*const classNotSelected = await getGridCellClass(0);const classSelected = await selectAllFiles(classNotSelected);expect(classNotSelected).not.toBe(classSelected);*/@@ -207,7 +203,7 @@ describe('TST50 - Perspective Grid', () => {/*** TODO merge with TST5005*/- test('TST5006 - Remove tags from selected files [TST5006,web,minio,electron]', async () => {+ test('TST5006 - Remove tags from selected files [web,minio,electron]', async () => {/*const classNotSelected = await getGridCellClass(0);const classSelected = await selectAllFiles(classNotSelected);expect(classNotSelected).not.toBe(classSelected);*/@@ -236,7 +232,7 @@ describe('TST50 - Perspective Grid', () => {}*/});- test('TST5007 - Remove all tags from selected files [TST5007,web,minio,electron]', async () => {+ test('TST5007 - Remove all tags from selected files [web,minio,electron]', async () => {//open Option menuawait clickOn('[data-tid=gridPerspectiveOptionsMenu]');//click on hide directories@@ -281,7 +277,7 @@ describe('TST50 - Perspective Grid', () => {* TODO copy file on minio failed with path: ./testdata-tmp/file-structure/supported-filestypes/empty_folder* web cannot find bmp file*/- test('TST5008 - Copy file [TST5008,electron]', async () => {+ test('TST5008 - Copy file [electron]', async () => {const fileName = await getFirstFileName();// select file@@ -303,10 +299,12 @@ describe('TST50 - Perspective Grid', () => {await expectElementExist(selectorFile, false);});+ it.skip('TST5009 - Copy file on different partition [Electron, manual]', async () => {});+/*** TODO reindexing don't work in web*/- test('TST5010 - Move file [TST5010,minio,electron]', async () => {+ test('TST5010 - Move file [minio,electron]', async () => {await searchEngine('epub');// select file@@ -330,7 +328,11 @@ describe('TST50 - Perspective Grid', () => {await expectElementExist(selectorFile, false);});- test('TST5013 - Delete files from selection (many files) [TST5013,web,minio,electron]', async () => {+ it.skip('TST5011 - Move file drag&drop in location navigator [Electron, manual]', async () => {});++ it.skip('TST5012 - Move file different partition [Electron, manual]', async () => {});++ test('TST5013 - Delete files from selection (many files) [web,minio,electron]', async () => {//open Option menuawait clickOn('[data-tid=gridPerspectiveOptionsMenu]');//click on hide directories@@ -368,6 +370,9 @@ describe('TST50 - Perspective Grid', () => {await waitForNotification();await expectElementExist(selectorFile, false);*/});++ it.skip('TST5015 - Tag file drag&drop in perspective [Electron, manual]', async () => {});+/*test('TST51** - Show/Hide directories in perspective view', async () => { //TODOawait global.client.waitForVisible('[data-tid=gridPerspectiveToggleShowDirectories]'diff --git a/tests/e2e/perspective.spec.js b/tests/e2e/perspective.spec.jsdeleted file mode 100644index 0f74dbed5..000000000--- a/tests/e2e/perspective.spec.js+++ /dev/null@@ -1,26 +0,0 @@-import { clearLocalStorage, delay } from './hook';-import {- createLocation,- defaultLocationName,- defaultLocationPath,- openLocation-} from './location.helpers';--describe('TST11 - Perspective tests', () => {- beforeEach(async () => {- await clearLocalStorage();- await delay(500);- await createLocation(defaultLocationPath, defaultLocationName, true);- await delay(500);- await openLocation(defaultLocationName);- await delay(500);- });-- it.skip('TST1101 - Add perspective', () => {});-- it.skip('TST1102 - Remove perspective', () => {});-- it.skip('TST1103 - Change perspective order', () => {});-- it.skip('TST1104 - Should switch perspective to grid perspective', () => {});-});diff --git a/tests/e2e/search.spec.js b/tests/e2e/search.helpers.jssimilarity index 100%rename from tests/e2e/search.spec.jsrename to tests/e2e/search.helpers.jsdiff --git a/tests/e2e/settings.spec.js b/tests/e2e/settings.spec.jsdeleted file mode 100644index 961e74e5b..000000000--- a/tests/e2e/settings.spec.js+++ /dev/null@@ -1,65 +0,0 @@-/* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved. */-import { delay, clearLocalStorage } from './hook';-import {- createLocation,- openLocation,- defaultLocationPath,- checkForIdExist-} from './location.helpers';--const testLocationName = '' + new Date().getTime();-const testNewLocationName = '' + new Date().getTime();--const hiddenFile = '.ts';-const perspectiveGridTable = '[data-tid=perspectiveGridFileTable]';--describe('TST10 - General', () => {- beforeEach(async () => {- await clearLocalStorage();- await delay(500);- });-- it('TST1001 - Show files & directories with dots in the begin of the filename', async () => {- await createLocation(defaultLocationPath, testLocationName, true);- await delay(500);- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- // activate 'Show Hidden File' functionality in the general settings- await global.client.waitForVisible(- '[data-tid=settingsSetShowUnixHiddenEntries]'- );- await global.client.click('[data-tid=settingsSetShowUnixHiddenEntries]');- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');- await openLocation(testLocationName);- // should find hidden file with dot in the begin of the filename- await global.client.waitForVisible(perspectiveGridTable);- const hiddenEntry = await global.client.getText(- perspectiveGridTable,- hiddenFile- );- expect(hiddenFile).toBe(hiddenEntry);- });-- it('TST1002 - Use default location as startup location', async () => {- // activate 'Use default location as a startup location'- // functionality in the general settings- await delay(500);- await createLocation(defaultLocationPath, testLocationName, true);- await delay(500);- await createLocation(defaultLocationPath, testNewLocationName, true);- await delay(500);- await global.client.waitForVisible('[data-tid=settings]');- await global.client.click('[data-tid=settings]');- await global.client.waitForVisible(- '[data-tid=settingsSetUseDefaultLocation]'- );- await global.client.click('[data-tid=settingsSetUseDefaultLocation]');- await global.client.waitForVisible('[data-tid=closeSettingsDialog]');- await global.client.click('[data-tid=closeSettingsDialog]');- // reload application- await global.client.keys('F5');- await delay(500);- await checkForIdExist('perspectiveGridFileTable');- });-});diff --git a/tests/e2e/tag.e2e.js b/tests/e2e/tag.e2e.jsindex 8971a221c..457d23ee9 100644--- a/tests/e2e/tag.e2e.js+++ b/tests/e2e/tag.e2e.js@@ -46,7 +46,7 @@ describe('TST04 - Testing the tag library:', () => {await clickOn('[data-tid=tagLibrary]');});- it('TST0401 - Should create a tag group [TST0401,web,minio,electron]', async () => {+ it('TST0401 - Should create a tag group [web,minio,electron]', async () => {await createTagGroup(testGroup);await expectElementExist('[data-tid=tagLibraryTagGroupTitle_' + testGroup + ']',@@ -54,7 +54,7 @@ describe('TST04 - Testing the tag library:', () => {);});- it('TST0402 - Should delete tag group [TST0402,web,minio,electron]', async () => {+ it('TST0402 - Should delete tag group [web,minio,electron]', async () => {await createTagGroup(testGroup);await expectElementExist('[data-tid=tagLibraryTagGroupTitle_' + testGroup + ']',@@ -73,7 +73,7 @@ describe('TST04 - Testing the tag library:', () => {);});- it('TST0403 - Rename tag group [TST0403,web,minio,electron]', async () => {+ it('TST0403 - Rename tag group [web,minio,electron]', async () => {await createTagGroup(testGroup);await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');await clickOn('[data-tid=editTagGroup]');@@ -85,7 +85,7 @@ describe('TST04 - Testing the tag library:', () => {);});- it('TST0404 - Change default tag group tag colors [TST0404,web,minio,electron]', async () => {+ it('TST0404 - Change default tag group tag colors [web,minio,electron]', async () => {await createTagGroup(testGroup);await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');await clickOn('[data-tid=editTagGroup]');@@ -136,7 +136,7 @@ describe('TST04 - Testing the tag library:', () => {);*/});- it('TST0405 - Should add tag to a tag group [TST0405,web,minio,electron]', async () => {+ it('TST0405 - Should add tag to a tag group [web,minio,electron]', async () => {await createTagGroup(testGroup);await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');@@ -151,7 +151,9 @@ describe('TST04 - Testing the tag library:', () => {expect(addedTag.selector).toBe('[data-tid=' + newTagName + ']');*/});- it('TST0405 - Add tag (s) Should add comma separated tags to a tag group [TST0405,web,minio,electron]', async () => {+ it.skip('TST0406 - Import tag groups [Electron, manual]', async () => {});++ it('TST0405 - Add tag (s) Should add comma separated tags to a tag group [web,minio,electron]', async () => {await createTagGroup(testGroup);await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');await addTags(arrTags);@@ -164,7 +166,7 @@ describe('TST04 - Testing the tag library:', () => {}});- it('TST0407 - Should rename tag [TST0407,web,minio,electron]', async () => {+ it('TST0407 - Should rename tag [web,minio,electron]', async () => {await tagMenu('done', 'editTagDialog');await setInputKeys('editTagInput', testTagName);await clickOn('[data-tid=editTagConfirm]');@@ -175,14 +177,14 @@ describe('TST04 - Testing the tag library:', () => {);});- it('TST0408 - Should delete tag from a tag group [TST0408,web,minio,electron]', async () => {+ it('TST0408 - Should delete tag from a tag group [web,minio,electron]', async () => {await tagMenu('next', 'deleteTagDialog');await global.client.pause(500);await clickOn('[data-tid=confirmDeleteTagDialogTagMenu]');await expectElementExist('[data-tid=tagContainer_next]', false);});- it('TST0409 - Should sort tags in a tag group lexicographically [TST0409,web,minio,electron]', async () => {+ it.skip('TST0409 - Should sort tags in a tag group lexicographically [web,minio,electron]', async () => {await clickOn('[data-tid=tagLibraryMoreButton_ToDo_Workflow]');await clickOn('[data-tid=sortTagGroup]'); // TODO no validation, expect// const tagGroupElements = await global.client.getText('//button[contains(., "' + testTagName + '")]');@@ -190,7 +192,7 @@ describe('TST04 - Testing the tag library:', () => {// expect(editedTag).toBe(testTagName);});- it('TST0410 - Default colors for tags from settings [TST0410,web,minio,electron]', async () => {+ it('TST0410 - Default colors for tags from settings [web,minio,electron]', async () => {await clickOn('[data-tid=settings]');await global.client.pause(500);await clickOn('[data-tid=settingsToggleDefaultTagBackgroundColor]');@@ -266,7 +268,7 @@ describe('TST04 - Testing the tag library:', () => {expect(style).toContain('rgb(208, 107, 100)');*/});- it('TST0411 - Should move tag group down [TST0411]', async () => {+ it.skip('TST0411 - Should move tag group down [Electron]', async () => {await clickOn('[data-tid=tagLibraryMoreButton_ToDo_Workflow]');await clickOn('[data-tid=moveTagGroupDown]'); // TODO no test confirmation, expect// await global.client.getText('[data-tid=tagLibraryTagGroupList]').then((name) => {@@ -278,7 +280,7 @@ describe('TST04 - Testing the tag library:', () => {// });});- it('TST0412 - Should move tag group up [TST0412]', async () => {+ it.skip('TST0412 - Should move tag group up [Electron]', async () => {await clickOn('[data-tid=tagLibraryMoreButton_Common_Tags]');await clickOn('[data-tid=moveTagGroupUp]'); // TODO no test confirmation// await global.client.getText('[data-tid=tagLibraryTagGroupList]').then((name) => {@@ -288,4 +290,12 @@ describe('TST04 - Testing the tag library:', () => {// return true;// });});++ it.skip('TST0414 - Tag file with drag and drop [Electron, manual]', async () => {});++ it.skip('TST0415 - Open export tag groups dialog [Electron]', async () => {});++ it.skip('TST0416 - Export tag groups / all / some [Electron, manual]', async () => {});++ it.skip('TST0417 - Collect tags from current location [Electron, Pro]', async () => {});});diff --git a/tests/e2e/test-utils.spec.js b/tests/e2e/test-utils.jssimilarity index 100%rename from tests/e2e/test-utils.spec.jsrename to tests/e2e/test-utils.jsdiff --git a/tests/e2e/viewer-html.e2e.js b/tests/e2e/viewer-html.e2e.jsindex c81b4cad9..6d65acaee 100644--- a/tests/e2e/viewer-html.e2e.js+++ b/tests/e2e/viewer-html.e2e.js@@ -11,7 +11,7 @@ import {createMinioLocation} from './location.helpers';import { closeOpenedFile, openCloseAboutDialog } from './general.helpers';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';const title = 'About HTML Viewer';@@ -79,4 +79,14 @@ describe('TST65 - HTML viewer [electron]', () => {await global.client.switchToParentFrame();await closeOpenedFile();});++ it.skip('TST6504 - Open source url [Electron, manual]', async () => {});++ it.skip('TST6505 - Find in document [Electron, manual]', async () => {});++ it.skip('TST6506 - Change theme [Electron, manual]', async () => {});++ it.skip('TST6507 - Open print dialog [Electron, manual]', async () => {});++ it.skip('TST6508 - Testing embedding local content like images [Electron, manual]', async () => {});});diff --git a/tests/e2e/viewer-image.e2e.js b/tests/e2e/viewer-image.e2e.jsindex 702ced853..59cb0ef5a 100644--- a/tests/e2e/viewer-image.e2e.js+++ b/tests/e2e/viewer-image.e2e.js@@ -10,7 +10,7 @@ import {createMinioLocation} from './location.helpers';import { clickOn, closeOpenedFile } from './general.helpers';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';export const firstFile = '/span';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';@@ -53,7 +53,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeFileProperties();});- it('TST5301 - Open JPG [TST5301]', async () => {+ it('TST5301 - Open JPG [electron]', async () => {await delay(500);await searchEngine('_exif');await delay(500);@@ -65,7 +65,7 @@ describe('TST53 - Image viewer [electron]', () => {// TODO test for finding a text in the exif});- it('TST5302 - Open BMP [TST5302]', async () => {+ it('TST5302 - Open BMP [electron]', async () => {await delay(500);await searchEngine('bmp');await delay(500);@@ -76,7 +76,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5303 - Open GIF [TST5303]', async () => {+ it('TST5303 - Open GIF [electron]', async () => {await delay(500);await searchEngine('gif');await delay(500);@@ -87,7 +87,9 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5305 - Open W-E-B-P [TST5305]', async () => {+ it.skip('TST5304 - Open Animated GIF, check if plays [Electron, manual]', async () => {});++ it('TST5305 - Open W-E-B-P [electron]', async () => {await delay(500);await searchEngine('webp');await delay(500);@@ -98,7 +100,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5306 - Open SVG [TST5306]', async () => {+ it('TST5306 - Open SVG [electron]', async () => {await delay(500);await searchEngine('svg');await delay(500);@@ -109,7 +111,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5307 - Open PNG [TST5307]', async () => {+ it('TST5307 - Open PNG [electron]', async () => {await delay(500);await searchEngine('png');await delay(500);@@ -120,7 +122,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5308 - Open PSD [TST5308]', async () => {+ it('TST5308 - Open PSD [electron]', async () => {await delay(500);await searchEngine('psd');await delay(500);@@ -131,7 +133,7 @@ describe('TST53 - Image viewer [electron]', () => {await closeOpenedFile();});- it('TST5309 - Open TIFF [TST5309]', async () => {+ it('TST5309 - Open TIFF [electron]', async () => {await delay(500);await searchEngine('tiff');await delay(500);@@ -140,9 +142,26 @@ describe('TST53 - Image viewer [electron]', () => {await file.doubleClick();await delay(500);await closeOpenedFile();+ });- // TODO Open and close About dialog+ it.skip('TST5310 - Rotate Image Left, Right, Zoom In, Out, Reset [Electron, manual]', async () => {});++ it.skip('TST5311 - Zoom with mouse wheel [Electron, manual]', async () => {});++ it.skip('TST5312 - Zoom with touch [Electron, manual]', async () => {});++ it.skip('TST5313 - Rotate JPG according to EXIF [Electron, manual]', async () => {});+ it.skip('TST5314 - Change background colors [Electron, manual]', async () => {});++ it.skip('TST5315 - Remove unneeded rotation css classes, reset rotation [Electron, manual]', async () => {});++ it.skip('TST5316 - Switching between Color / Black&White mode [Electron, manual]', async () => {});++ it.skip('TST5317 - Read exif data from JPG [Electron]', async () => {});++ it.skip('TST5318 - Open and close about dialog [Electron]', async () => {+ // TODO Open and close About dialog// const openViewerMenu = await global.client('#viewerMainMenuButton');// await openViewerMenu.waitForDisplayed();// await openViewerMenu.click();diff --git a/tests/e2e/viewer-markdown.e2e.js b/tests/e2e/viewer-markdown.e2e.jsindex d95140595..3c0bd0dbb 100644--- a/tests/e2e/viewer-markdown.e2e.js+++ b/tests/e2e/viewer-markdown.e2e.js@@ -11,7 +11,7 @@ import {createMinioLocation} from './location.helpers';import { closeOpenedFile } from './general.helpers';-import { searchEngine } from './search.spec';+import { searchEngine } from './search.helpers';export const firstFile = '/span';export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';@@ -61,4 +61,18 @@ describe('TST54 - Markdown viewer [electron]', () => {await delay(500);await closeOpenedFile();});++ it.skip('TST5402 - Test opening of links [Electron, manual]', async () => {});++ it.skip('TST5403 - Find in document [Electron, manual]', async () => {});++ it.skip('TST5404 - Change zoom [Electron, manual]', async () => {});++ it.skip('TST5405 - Change theme [Electron, manual]', async () => {});++ it.skip('TST5406 - Show print dialog [Electron, manual]', async () => {});++ it.skip('TST5407 - Open and close about dialog [Electron]', async () => {});++ it.skip('TST5408 - Testing embedding local content like images [Electron, manual]', async () => {});});