TagSpaces is an offline, open source, document manager with tagging support
e2e fixes
sytolkbb61ecad2ad4
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex f3232c022..b25fcf289 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -353,15 +353,14 @@ export async function expectElementSelected(isSelected = true,timeout = 2000,) {- await expectElementExist(- '[data-tid="fsEntryName_' +- dataTidFormat(selector) +- '"] [data-testid="' +- (isSelected ? 'CheckCircleIcon' : 'RadioButtonUncheckedIcon') +- '"]',- true,- timeout,- );+ // [data-testid="' + (isSelected ? 'CheckCircleIcon' : 'RadioButtonUncheckedIcon') + '"]+ const sel = '[data-tid="fsEntryName_' + dataTidFormat(selector) + '"]';+ await expectElementExist(sel, true, timeout);+ const item = await global.client.$(sel);+ const style = await item.getAttribute('style');+ const selected =+ style.indexOf('rgb(29') !== -1 && style.indexOf('transparent') === -1;+ expect(selected).toBe(isSelected);}export async function expectElementExist(@@ -427,7 +426,7 @@ export async function createLocation(export async function setGridOptions(perspective = 'list',showDirectories = true,- entrySize = undefined,+ // entrySize = undefined,) {// open Option menuawait clickOn('[data-tid=' + perspective + 'PerspectiveOptionsMenu]');@@ -441,9 +440,9 @@ export async function setGridOptions();}- if (entrySize) {+ /*if (entrySize) {await clickOn('[data-tid=' + entrySize + ']');- }+ }*/await clickOn('[data-tid=defaultSettings]');}/**@@ -469,10 +468,10 @@ export async function selectAllFiles() {}export async function selectFilesByID(arrEntryIds = []) {- await clickOn('[data-tid=openListPerspective]');+ //await clickOn('[data-tid=openListPerspective]');for (let i = 0; i < arrEntryIds.length; i++) {await clickOn(- 'div[data-entry-id="' + arrEntryIds[i] + '"] div[data-tid=rowCellTID]',+ 'div[data-entry-id="' + arrEntryIds[i] + '"] div:nth-child(3) div button',);/* let entry = await global.client.$('[data-entry-id="' + arrEntryIds[i] + '"]'@@ -483,15 +482,37 @@ export async function selectFilesByID(arrEntryIds = []) {// await clickOn('[data-tid=gridPerspectiveContainer]');}+export async function selectRowFiles(arrIndex = []) {+ await setGridOptions('grid', false);+ const filesList = await global.client.$$(+ '[data-tid=perspectiveGridFileTable] > span',+ );+ const arrElements = [];+ if (filesList.length > 0) {+ for (let i = 0; i < arrIndex.length; i++) {+ const index =+ arrIndex[i] < 0 ? filesList.length + arrIndex[i] : arrIndex[i];+ if (filesList[index]) {+ const divEl = await filesList[index].$('div div');+ const id = await divEl.getAttribute('data-entry-id');+ arrElements.push(id);+ const spanEl = await divEl.$('div:nth-child(3) div span');+ await spanEl.click();+ }+ }+ }+ expect(arrElements.length).toBe(arrIndex.length);+ return arrElements;+}/*** TODO element 0 is not clickable* @param arrIndex* @returns {Promise<*>}*/-export async function selectRowFiles(arrIndex = []) {+/*export async function selectRowFiles(arrIndex = []) {await global.client.waitForSelector('[data-tid=openListPerspective]');await clickOn('[data-tid=openListPerspective]');- await setGridOptions('list', false, 'gridPerspectiveEntrySizeNormal');+ await setGridOptions('list', false); //, 'gridPerspectiveEntrySizeNormal');// const filesList = await global.client.$('[data-tid=perspectiveGridFileTable]');const filesList = await global.client.$$('[data-tid=rowCellTID]');const arrElements = [];@@ -506,19 +527,10 @@ export async function selectRowFiles(arrIndex = []) {const id = await parent.getAttribute('data-entry-id');arrElements.push(id);// const classNotSelected = await parent.getAttribute('class');- // const elNotSelected = await parent.$('//*[@class="' + classNotSelected + '"]');+ // const elNotSelected = await parent.$('//!*[@class="' + classNotSelected + '"]');await clickOn('div[data-entry-id="' + id + '"] div[data-tid=rowCellTID]',);- // filesList[index].click();- // const selector = '//*[@class="' + classNotSelected + '"]';- /* const selector =- 'div[data-entry-id=' + id + '].' + classNotSelected.replace(/ /g, '.');- await isDisplayed(selector, false); */- /* await global.client.waitForFunction(selector => {- const el = document.querySelector(selector);- return el === null;- }, selector); */} else {console.debug('selectRowFiles filesList.length:' +@@ -533,7 +545,7 @@ export async function selectRowFiles(arrIndex = []) {expect(arrElements.length).toBe(arrIndex.length);// await clickOn('[data-tid=gridPerspectiveContainer]');return arrElements;-}+}*//*** TODO holdDownKey + click not work:diff --git a/tests/e2e/perspective-grid-right-button.pw.e2e.js b/tests/e2e/perspective-grid-right-button.pw.e2e.jsindex 9aec38055..78f773dd9 100644--- a/tests/e2e/perspective-grid-right-button.pw.e2e.js+++ b/tests/e2e/perspective-grid-right-button.pw.e2e.js@@ -233,7 +233,7 @@ test.describe('TST50** - Right button on a file', () => {*/test('TST5024 - Show files with a given tag (tag menu)', async () => {const selectedIds = await selectRowFiles([0, 1, 2]);- await AddRemoveTagsToSelectedFiles('list', [testTagName], true);+ await AddRemoveTagsToSelectedFiles('grid', [testTagName], true);await showFilesWithTag(testTagName);await clickOn('[data-tid=openDefaultPerspective]');@@ -248,7 +248,7 @@ test.describe('TST50** - Right button on a file', () => {// cleanupawait clickOn('#clearSearchID');await selectRowFiles([0, 1, 2]);- await AddRemoveTagsToSelectedFiles('list', [testTagName], false);+ await AddRemoveTagsToSelectedFiles('grid', [testTagName], false);await expectElementExist('[data-tid=tagMoreButton_' + testTagName + ']',false,diff --git a/tests/e2e/perspective-grid.pw.e2e.js b/tests/e2e/perspective-grid.pw.e2e.jsindex bf03d57b3..23c6f0736 100644--- a/tests/e2e/perspective-grid.pw.e2e.js+++ b/tests/e2e/perspective-grid.pw.e2e.js@@ -109,7 +109,7 @@ test.describe('TST50 - Perspective Grid', () => {let selectedIds = await selectRowFiles([0, 1, 2]);const tags = ['test-tag1', 'test-tag2'];- await AddRemoveTagsToSelectedFiles('list', tags);+ await AddRemoveTagsToSelectedFiles('grid', tags);for (let i = 0; i < tags.length; i++) {await expectElementExist(@@ -125,10 +125,10 @@ test.describe('TST50 - Perspective Grid', () => {); */}- selectedIds = await selectRowFiles([0, 1, 2]);+ // selectedIds = await selectRowFiles([0, 1, 2]);// tags = ['test-tag1', 'test-tag2'];- await AddRemoveTagsToSelectedFiles('list', tags, false);+ await AddRemoveTagsToSelectedFiles('grid', tags, false);for (let i = 0; i < tags.length; i++) {await expectElementExist(@@ -150,11 +150,11 @@ test.describe('TST50 - Perspective Grid', () => {test('TST5007 - Remove all tags from selected files [web,minio,electron]', async () => {const selectedIds = await selectRowFiles([0, 1, 2]);const tags = ['test-tag1', 'test-tag2', 'test-tag3'];- await AddRemoveTagsToSelectedFiles('list', tags, true);+ await AddRemoveTagsToSelectedFiles('grid', tags, true);- await selectFilesByID(selectedIds);+ //await selectFilesByID(selectedIds);- await clickOn('[data-tid=listPerspectiveAddRemoveTags]');+ await clickOn('[data-tid=gridPerspectiveAddRemoveTags]');await clickOn('[data-tid=cleanTagsMultipleEntries]');for (let i = 0; i < tags.length; i++) {@@ -164,14 +164,6 @@ test.describe('TST50 - Perspective Grid', () => {5000,);}- /* for (let i = 0; i < selectedIds.length; i++) {- const gridElement = await global.client.$(- '[data-entry-id="' + selectedIds[i] + '"]'- );- await isElementDisplayed(gridElement);- const tags = await extractTags(gridElement);- expect(tags.length).toBe(0);- } */});test('TST5008 - Copy file [web,minio,electron]', async () => {@@ -250,7 +242,7 @@ test.describe('TST50 - Perspective Grid', () => {test('TST5013 - Delete files from selection (many files) [web,minio,electron]', async () => {const selectedIds = await selectRowFiles([0, 1, 2]);- await clickOn('[data-tid=listPerspectiveDeleteMultipleFiles]');+ await clickOn('[data-tid=gridPerspectiveDeleteMultipleFiles]');await clickOn('[data-tid=confirmDeleteFileDialog]');await clickOn('[data-tid=openDefaultPerspective]');diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.jsindex 546bb7210..4292113af 100644--- a/tests/e2e/search.helpers.js+++ b/tests/e2e/search.helpers.js@@ -123,7 +123,7 @@ export async function addRemoveTagsInSearchResults(let selectedIds = await selectRowFiles([0]);- await AddRemoveTagsToSelectedFiles('list', tags);+ await AddRemoveTagsToSelectedFiles('grid', tags);for (let i = 0; i < tags.length; i++) {await expectElementExist(@@ -132,11 +132,11 @@ export async function addRemoveTagsInSearchResults(5000,);}- if (await isDisabled('[data-tid=listPerspectiveAddRemoveTags]')) {+ /*if (await isDisabled('[data-tid=listPerspectiveAddRemoveTags]')) {//select rows to enable buttonselectedIds = await selectRowFiles([0]);- }- await AddRemoveTagsToSelectedFiles('list', tags, false);+ }*/+ await AddRemoveTagsToSelectedFiles('grid', tags, false);for (let i = 0; i < tags.length; i++) {await expectElementExist(diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.jsindex 1fa3a01e2..f9a96ec59 100644--- a/tests/e2e/search.pw.e2e.js+++ b/tests/e2e/search.pw.e2e.js@@ -138,14 +138,13 @@ test.describe('TST06 - Test Search in file structure:', () => {test('TST0609 - Show thumbnails of image files in the search results [web,minio,electron]', async () => {const searchQuery = 'jpg'; //'sample_exif.jpg';await addSearchCommand(searchQuery, true);- await global.client.waitForSelector('img[alt=thumbnail]', {+ await global.client.waitForSelector('img[alt="thumbnail image"]', {visible: true,});- const imageLocator = global.client.locator('img[alt=thumbnail]');+ const imageLocator = global.client.locator('img[alt="thumbnail image"]');const imageCount = await imageLocator.count();expect(imageCount).toBeGreaterThan(0);const images = await imageLocator; //.elements();- //const images = await global.client.$$('img[alt=thumbnail]');for (let i = 0; i < images.length; i++) {await expect(images[i]).toBeVisible();/*const src = await images[i].getAttribute('src');