Skip to content

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

e2e fix

sytolk39654e40a3c8
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index b366f089b..f899a15d0 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -642,6 +642,14 @@ export function generateFileName(fileName, fileExt, tags, tagDelimiter = ' ') {
return newFileName;
}
+/**
+ * @deprecated view expectTagsExist
+ * @param selector
+ * @param arrTagNames
+ * @param exist
+ * @param timeout
+ * @returns {Promise<void>}
+ */
export async function expectTagsExistBySelector(
selector,
arrTagNames,
@@ -652,6 +660,13 @@ export async function expectTagsExistBySelector(
await expectTagsExist(gridElement, arrTagNames, exist);
}
+/**
+ * @deprecated use: await expectElementExist('[data-tid=tagContainer_' + tagName + ']',true,8000,'[data-tid=perspectiveGridFileTable]')
+ * @param gridElement
+ * @param arrTagNames
+ * @param exist
+ * @returns {Promise<void>}
+ */
export async function expectTagsExist(gridElement, arrTagNames, exist = true) {
// await expectExist(gridElement);
const tags = await extractTags(gridElement);
diff --git a/tests/e2e/perspective-grid-right-button.pw.e2e.js b/tests/e2e/perspective-grid-right-button.pw.e2e.js
index 8967146af..bd3390e3d 100644
--- a/tests/e2e/perspective-grid-right-button.pw.e2e.js
+++ b/tests/e2e/perspective-grid-right-button.pw.e2e.js
@@ -18,8 +18,6 @@ import {
createNewDirectory,
createTxtFile,
expectElementExist,
- expectTagsExist,
- expectTagsExistBySelector,
generateFileName,
getGridFileSelector,
reloadDirectory,
@@ -164,10 +162,12 @@ test.describe('TST50** - Right button on a file', () => {
await clickOn('[data-tid=fileContainerToggleProperties]');
await AddRemoveTagsToSelectedFiles('grid', [testTagName], true);
await expectElementExist(
- selectorFile + '[1]//div[@id="gridCellTags"]//button[1]',
- true
+ '[data-tid=tagContainer_' + testTagName + ']',
+ true,
+ 8000,
+ '[data-tid=perspectiveGridFileTable]'
);
- await expectTagsExistBySelector(selectorFile, [testTagName], true);
+ // await expectTagsExistBySelector(selectorFile, [testTagName], true);
/* await AddRemoveTagsToFile(perspectiveGridTable + firstFile, [testTagName], {
add: true
@@ -179,15 +179,12 @@ test.describe('TST50** - Right button on a file', () => {
await clickOn('[data-tid=confirmEditTagEntryDialog]');
// await waitForNotification();
+ //await expectTagsExistBySelector(selectorFile, [testTagName + 'Edited'],true);
await expectElementExist(
- selectorFile + '[1]//div[@id="gridCellTags"]//button[1]',
- true
- );
-
- await expectTagsExistBySelector(
- selectorFile,
- [testTagName + 'Edited'],
- true
+ '[data-tid=tagContainer_' + testTagName + 'Edited]',
+ true,
+ 8000,
+ '[data-tid=perspectiveGridFileTable]'
);
await testDataRefresh();
// cleanup
@@ -215,18 +212,21 @@ test.describe('TST50** - Right button on a file', () => {
await clickOn('[data-tid=fileContainerToggleProperties]');
await AddRemoveTagsToSelectedFiles('grid', [testTagName], true);
await expectElementExist(
- selectorFile + '[1]//div[@id="gridCellTags"]//button[1]',
- true
+ '[data-tid=tagContainer_' + testTagName + ']',
+ true,
+ 8000,
+ '[data-tid=perspectiveGridFileTable]'
);
- await expectTagsExistBySelector(selectorFile, [testTagName], true);
+ // await expectTagsExistBySelector(selectorFile, [testTagName], true);
await removeTagFromTagMenu(testTagName);
-
await expectElementExist(
- selectorFile + '[1]//div[@id="gridCellTags"]//button[1]',
- false
+ '[data-tid=tagContainer_' + testTagName + ']',
+ false,
+ 8000,
+ '[data-tid=perspectiveGridFileTable]'
);
- await expectTagsExistBySelector(selectorFile, [testTagName], false);
+ // await expectTagsExistBySelector(selectorFile, [testTagName], false);
});
/**
diff --git a/tests/e2e/perspective-grid.helpers.js b/tests/e2e/perspective-grid.helpers.js
index 0f37fd7c4..08e30a906 100644
--- a/tests/e2e/perspective-grid.helpers.js
+++ b/tests/e2e/perspective-grid.helpers.js
@@ -37,7 +37,7 @@ export async function AddRemoveTagsToSelectedFiles(
await clickOn('[data-tid=removeTagsMultipleEntries]');
}
// await waitForNotification();
- await isDisplayed('[data-tid=notificationTID]', false, 4500);
+ // await isDisplayed('[data-tid=notificationTID]', false, 4500);
/*const filesList = await global.client.$$(perspectiveGridTable + firstFile); // Selected file can be only one this check all files
for (let i = 0; i < filesList.length; i++) {
diff --git a/tests/e2e/perspective-grid.pw.e2e.js b/tests/e2e/perspective-grid.pw.e2e.js
index 34cf96978..92bec6636 100644
--- a/tests/e2e/perspective-grid.pw.e2e.js
+++ b/tests/e2e/perspective-grid.pw.e2e.js
@@ -13,7 +13,6 @@ import {
clickOn,
expectElementExist,
expectMetaFilesExist,
- expectTagsExistBySelector,
getGridCellClass,
getGridFileName,
getGridFileSelector,
@@ -99,12 +98,8 @@ test.describe('TST50 - Perspective Grid', () => {
const tags = ['test-tag1', 'test-tag2'];
await AddRemoveTagsToSelectedFiles('list', tags);
- for (let i = 0; i < selectedIds.length; i++) {
- await expectElementExist(
- // selectorFile + '[' + (i + 1) + ']//div[@id="gridCellTags"]//button[1]',
- '[data-tid=tagContainer_' + tags[0] + ']',
- true
- );
+ for (let i = 0; i < tags.length; i++) {
+ await expectElementExist('[data-tid=tagContainer_' + tags[i] + ']', true);
// const selectBox = await global.client.$('[data-tid=perspectiveGridFileTable]');
/* await expectTagsExistBySelector(
'[data-entry-id="' + selectedIds[i] + '"]',
@@ -118,17 +113,16 @@ test.describe('TST50 - Perspective Grid', () => {
// tags = ['test-tag1', 'test-tag2'];
await AddRemoveTagsToSelectedFiles('list', tags, false);
- for (let i = 0; i < selectedIds.length; i++) {
+ for (let i = 0; i < tags.length; i++) {
await expectElementExist(
- selectorFile + '[' + (i + 1) + ']//div[@id="gridCellTags"]//button[1]',
- false,
- 1500
+ '[data-tid=tagContainer_' + tags[i] + ']',
+ false
);
- await expectTagsExistBySelector(
+ /*await expectTagsExistBySelector(
'[data-entry-id="' + selectedIds[i] + '"]',
tags,
false
- );
+ );*/
}
});
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index a90400f60..de24554a0 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -120,10 +120,9 @@ export async function addRemoveTagsInSearchResults(
await AddRemoveTagsToSelectedFiles('list', tags);
- for (let i = 0; i < selectedIds.length; i++) {
+ for (let i = 0; i < tags.length; i++) {
await expectElementExist(
- // selectorFile + '[' + (i + 1) + ']//div[@id="gridCellTags"]//button[1]',
- '[data-tid=tagContainer_' + tags[0] + ']',
+ '[data-tid=tagContainer_' + tags[i] + ']',
true,
5000
);
@@ -134,16 +133,21 @@ export async function addRemoveTagsInSearchResults(
}
await AddRemoveTagsToSelectedFiles('list', tags, false);
- for (let i = 0; i < selectedIds.length; i++) {
+ for (let i = 0; i < tags.length; i++) {
await expectElementExist(
+ '[data-tid=tagContainer_' + tags[i] + ']',
+ false,
+ 5000
+ );
+ /*await expectElementExist(
selectorFile + '[' + (i + 1) + ']//div[@id="gridCellTags"]//button[1]',
false,
1500
- );
- await expectTagsExistBySelector(
+ );*/
+ /*await expectTagsExistBySelector(
'[data-entry-id="' + selectedIds[i] + '"]',
tags,
false
- );
+ );*/
}
}