Skip to content

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

skip general.e2e tests

stanimirc86ce1566209
diff --git a/tests/e2e/folder.e2e.js b/tests/e2e/folder.e2e.js
index cf6e09764..9f9f31e20 100644
--- a/tests/e2e/folder.e2e.js
+++ b/tests/e2e/folder.e2e.js
@@ -10,12 +10,12 @@ import {
} from './location.helpers';
import {
reloadDirectory,
- openEntry,
createNewDirectory,
deleteDirectory,
clickOn,
expectElementExist,
- setSettings
+ setSettings,
+ doubleClickOn
} from './general.helpers';
import { renameFolder } from './test-utils.spec';
@@ -38,7 +38,7 @@ describe('TST01 - Folder management [electron]', () => {
it('TST0101 - Create subfolder [TST0101,electron]', async () => {
const testFolder = await createNewDirectory();
await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');
- await openEntry(testFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
await deleteDirectory();
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
@@ -49,7 +49,7 @@ describe('TST01 - Folder management [electron]', () => {
// TODO minio
it('TST0102 - Reload folder [TST0102,electron]', async () => {
const testFolder = await createNewDirectory();
- await openEntry(testFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
await reloadDirectory();
await global.client.pause(500);
await deleteDirectory();
@@ -62,7 +62,7 @@ describe('TST01 - Folder management [electron]', () => {
// TODO
it('TST0103 - Rename folder [TST0103]', async () => {
const testFolder = await createNewDirectory();
- await openEntry(testFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
const newDirectoryName = await renameFolder();
//await openParentDir();
/*await expectElementExist('[data-tid=fsEntryName_' + newDirectoryName + ']');
@@ -79,7 +79,7 @@ describe('TST01 - Folder management [electron]', () => {
await global.client.pause(500);
const testFolder = await createNewDirectory();
await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');
- await openEntry(testFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
await deleteDirectory();
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
diff --git a/tests/e2e/general.e2e.js b/tests/e2e/general.e2e.js
index 4c07cab7c..e5265c6b7 100644
--- a/tests/e2e/general.e2e.js
+++ b/tests/e2e/general.e2e.js
@@ -6,11 +6,11 @@ import {
defaultLocationPath,
defaultLocationName,
closeFileProperties,
- createMinioLocation
+ createMinioLocation,
+ deleteFirstFile
} from './location.helpers';
import {
reloadDirectory,
- openEntry,
tsFolder,
createNewDirectory,
newHTMLFile,
@@ -50,47 +50,52 @@ describe('TST51 - Perspective Grid [general]', () => {
await closeFileProperties();
});
- it('TST0501 - Create HTML file [electron]', async () => {
- await createNewDirectory();
+ it('TST0501 - Create HTML file', async () => {
+ /*await createNewDirectory();
await reloadDirectory();
- await global.client.pause(500);
- await openEntry(testFolder);
+ // await global.client.pause(500);
+ await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');*/
+ //await setSettings('[data-tid=settingsSetUseTrashCan]');
+ //await global.client.pause(500);
await createNewDirectory();
- await reloadDirectory();
- await global.client.pause(500);
- await openEntry(testFolder);
+ // await reloadDirectory();
+ // await global.client.pause(500);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
// create new file
await newHTMLFile();
await closeOpenedFile();
- await reloadDirectory();
+ // await reloadDirectory();
await expectElementExist(selectorFile, true);
- await global.client.pause(500);
- await returnDirectoryBack();
+ /*await global.client.pause(500);
+ await returnDirectoryBack();*/
// delete directory
- await global.client.pause(500);
+
+ await deleteFirstFile();
await deleteDirectory(testFolder);
// await returnDirectoryBack();
+ await global.client.pause(500);
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
false
);
});
- it('TST0502 - Create MD file [electron]', async () => {
+ it('TST0502 - Create MD file', async () => {
await createNewDirectory();
- await reloadDirectory();
- await global.client.pause(500);
- await openEntry(testFolder);
+ // await reloadDirectory();
+ // await global.client.pause(500);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
// create new file
await newMDFile();
await closeOpenedFile();
- await reloadDirectory();
+ // await reloadDirectory();
await expectElementExist(selectorFile, true);
await global.client.pause(500);
- // delete directory
+ await deleteFirstFile();
await deleteDirectory(testFolder);
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
@@ -98,20 +103,20 @@ describe('TST51 - Perspective Grid [general]', () => {
);
});
- it('TST0502 - Create TEXT file [electron]', async () => {
+ it('TST0502 - Create TEXT file', async () => {
await createNewDirectory();
- await reloadDirectory();
- await global.client.pause(500);
- await openEntry(testFolder);
+ // await reloadDirectory();
+ // await global.client.pause(500);
+ await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
// create new file
await newTEXTFile();
await closeOpenedFile();
- await reloadDirectory();
+ // await reloadDirectory();
await expectElementExist(selectorFile, true);
await global.client.pause(500);
- // delete directory
+ await deleteFirstFile();
await deleteDirectory(testFolder);
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
@@ -126,7 +131,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('jpg');
// await openEntry('sample.jpg');
@@ -146,7 +151,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('mp4');
await doubleClickOn(perspectiveGridTable + firstFile);
@@ -160,7 +165,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('pdf');
await doubleClickOn(perspectiveGridTable + firstFile);
@@ -174,7 +179,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('odt');
await doubleClickOn(perspectiveGridTable + firstFile);
@@ -188,7 +193,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('tiff');
// await openEntry('sample.jpg');
@@ -204,7 +209,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('psd');
// await openEntry('sample.jpg');
@@ -220,7 +225,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('txt');
// await openEntry('sample.jpg');
@@ -236,7 +241,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('html');
// await openEntry('sample.jpg');
@@ -252,7 +257,7 @@ describe('TST51 - Perspective Grid [general]', () => {
await global.client.pause(500);
await reloadDirectory();
await global.client.pause(500);
- await openEntry(tsFolder);
+ await doubleClickOn('[data-tid=fsEntryName_' + tsFolder + ']');
await searchEngine('url');
// await openEntry('sample.jpg');
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index bab3fefd4..0d6fd2929 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -377,16 +377,6 @@ export async function reloadDirectory() {
await delay(500);*/
}
-export async function openEntry(entryName) {
- await doubleClickOn('[data-tid=fsEntryName_' + entryName + ']');
- /*const eName = await global.client.$(
- '[data-tid=fsEntryName_' + entryName + ']'
- );
- await eName.waitForDisplayed();
- await eName.doubleClick();
- await delay(500);*/
-}
-
export async function createNewDirectory(dirName = testFolder) {
await clickOn('[data-tid=folderContainerOpenDirMenu]');
await global.client.pause(500); // TODO the Menu is always in HTML
@@ -406,7 +396,8 @@ export async function createNewDirectory(dirName = testFolder) {
await delay(1500);
await confirmCreateNewDirectory.waitForDisplayed();
await confirmCreateNewDirectory.click();*/
- await global.client.pause(500); // minio
+ await waitForNotification();
+ // await global.client.pause(500); // minio
return dirName;
}
@@ -446,6 +437,7 @@ export async function closeOpenedFile() {
}
export async function deleteDirectory() {
+ await global.client.pause(500);
await clickOn('[data-tid=folderContainerOpenDirMenu]');
await clickOn('[data-tid=deleteDirectory]');
/*const deleteDirectory = await global.client.$('[data-tid=deleteDirectory]');
@@ -453,6 +445,7 @@ export async function deleteDirectory() {
await delay(500);
await deleteDirectory.click();*/
await clickOn('[data-tid=confirmDeleteDirectoryDialog]');
+ await waitForNotification();
/*const confirmDeleteDirectory = await global.client.$(
'[data-tid=confirmDeleteDirectoryDialog]'
);