TagSpaces is an offline, open source, document manager with tagging support
e2e fixes
sytolk7627cefb1842
diff --git a/package.json b/package.jsonindex aed8f80b9..a4bd27aaf 100644--- a/package.json+++ b/package.json@@ -33,6 +33,7 @@"build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build","build-e2e-dev": "ts-node ./.erb/scripts/clean.js && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:web\"","build-e2e-web": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro",+ "build-e2e-web-dev": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro-dev","build:cordova": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.prod.ts","build:cordova:dev": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.dev.ts","build:dll": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex acbb2faea..dd57ca486 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -1,12 +1,12 @@{"name": "tagspaces",- "version": "6.3.1",+ "version": "6.3.2","lockfileVersion": 2,"requires": true,"packages": {"": {"name": "tagspaces",- "version": "6.3.1",+ "version": "6.3.2","hasInstallScript": true,"license": "AGPL-3.0","dependencies": {diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsxindex f14531bba..cfbed2554 100644--- a/src/renderer/components/EntryContainer.tsx+++ b/src/renderer/components/EntryContainer.tsx@@ -325,7 +325,11 @@ function EntryContainer() {? content.slice(1): content;fileViewer.current.contentWindow.postMessage(- { action: 'fileContent', content: cleanedContent },+ {+ action: 'fileContent',+ content: cleanedContent,+ isEditMode: isEditMode,+ },'*',);});diff --git a/src/renderer/components/FileView.tsx b/src/renderer/components/FileView.tsxindex 8ac76db3f..1451e7ee5 100644--- a/src/renderer/components/FileView.tsx+++ b/src/renderer/components/FileView.tsx@@ -19,13 +19,11 @@import React, { MutableRefObject, useEffect } from 'react';import { rgbToHex, useTheme } from '@mui/material/styles';import CloseIcon from '@mui/icons-material/Close';-import useEventListener from '-/utils/useEventListener';import { useTranslation } from 'react-i18next';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';import AppConfig from '-/AppConfig';-import { actions as SettingsActions } from '-/reducers/settings';interface Props {isFullscreen?: boolean;diff --git a/src/renderer/components/SearchAutocomplete.tsx b/src/renderer/components/SearchAutocomplete.tsxindex 266d9a9e2..bbca790a9 100644--- a/src/renderer/components/SearchAutocomplete.tsx+++ b/src/renderer/components/SearchAutocomplete.tsx@@ -501,8 +501,9 @@ function SearchAutocomplete(props: Props) {return;}if (- tempSearchQuery.textQuery.startsWith('ts:?ts') ||- tempSearchQuery.textQuery.startsWith(AppConfig.tsProtocol + '?ts')+ tempSearchQuery.textQuery &&+ (tempSearchQuery.textQuery.startsWith('ts:?ts') ||+ tempSearchQuery.textQuery.startsWith(AppConfig.tsProtocol + '?ts'))) {openLinkDispatch(tempSearchQuery.textQuery, { fullWidth: false });clearSearch();diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex e2ccbeb39..e32c7934d 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -418,14 +418,30 @@ export async function expectElementSelected(isSelected = true,timeout = 4000,) {- // [data-testid="' + (isSelected ? 'CheckCircleIcon' : 'RadioButtonUncheckedIcon') + '"]- const sel = '[data-tid="fsEntryName_' + dataTidFormat(selector) + '"]';+ 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);++ const startTime = Date.now();++ while (Date.now() - startTime < timeout) {+ const finalStyle = await item.evaluate((el) => el.getAttribute('style'));+ const selected =+ finalStyle.includes('rgb(29') && !finalStyle.includes('transparent');++ if (selected === isSelected) {+ expect(selected).toBe(isSelected); // Pass the test if the condition is met+ return;+ }++ await global.client.waitForTimeout(100); // Small delay to avoid excessive CPU usage+ }++ throw new Error(+ `Element ${sel} did not reach expected selected state: ${isSelected} within ${timeout}ms`,+ );}export async function expectElementExist(diff --git a/tests/e2e/perspective-grid-right-button.pw.e2e.js b/tests/e2e/perspective-grid-right-button.pw.e2e.jsindex 6b2060c26..23c1d0c3a 100644--- a/tests/e2e/perspective-grid-right-button.pw.e2e.js+++ b/tests/e2e/perspective-grid-right-button.pw.e2e.js@@ -247,6 +247,7 @@ test.describe('TST50** - Right button on a file', () => {// cleanupawait clickOn('#clearSearchID');+ await expectElementExist('#textQuery', false, 5000);await selectRowFiles([0, 1, 2]);await AddRemoveTagsToSelectedFiles('grid', [testTagName], false);await expectElementExist(diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.jsindex ee8cf10c9..f4495cc20 100644--- a/tests/e2e/search.pw.e2e.js+++ b/tests/e2e/search.pw.e2e.js@@ -247,6 +247,7 @@ test.describe('TST06 - Test Search in file structure:', () => {await expectElementSelected('sample' + ' ' + tags1.join(' ') + '.' + file1,true,+ 5000,);const file2 = 'jpg';@@ -274,7 +275,7 @@ test.describe('TST06 - Test Search in file structure:', () => {await addSearchCommand('+' + tags1[0], true);await expectElementExist(getFileName(file1, tags1), true, 5000);await expectElementExist(getFileName(file2, tags2), true, 5000);- await expectElementExist(getFileName(file3, tags3), false, 5000);+ await expectElementExist(getFileName(file3, tags3), false, 5000000);// Search for - tagawait addSearchCommand('-' + tags2[1], true);await expectElementExist(getFileName(file1, tags1), true, 5000);@@ -282,6 +283,7 @@ test.describe('TST06 - Test Search in file structure:', () => {await expectElementExist(getFileName(file3, tags3), false, 5000);await clickOn('#clearSearchID');+ await expectElementExist('#textQuery', false, 5000);// Search for | tag - tagawait addSearchCommand('|' + tags1[0], false);@@ -374,6 +376,7 @@ test.describe('TST06 - Test Search in file structure:', () => {5000,);await clickOn('#clearSearchID');+ await expectElementExist('#textQuery', false, 5000);await global.client.dblclick('[data-tid=fsEntryName_empty_folder]');await addSearchCommand('sc:', false);