Skip to content

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

fixes

sytolk68b98bb5135b
diff --git a/tests/e2e/quick-access.pw.e2e.js b/tests/e2e/quick-access.pw.e2e.js
index 15ebe4cac..3f0b46efe 100644
--- a/tests/e2e/quick-access.pw.e2e.js
+++ b/tests/e2e/quick-access.pw.e2e.js
@@ -14,7 +14,7 @@ import {
setInputKeys
} from './general.helpers';
import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';
-import { createSavedSearch } from './search.helpers';
+import { createSavedSearch, searchEngine } from "./search.helpers";
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../app/services/test';
@@ -343,4 +343,15 @@ describe('TST09 - Quick access', () => {
);
}
});
+
+ test.skip('TST0914 - Add search to search history and search [web,electron]', async () => {
+ await searchEngine('txt');
+ await clickOn('#clearSearchID');
+
+ await expectElementExist(
+ '[data-tid=tsLastOpenedFoldersHistoryTID]',
+ false,
+ 10000
+ );
+ });
});
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index 926921b8f..0de64cd7a 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -17,42 +17,48 @@ export const emptyFolderName = 'empty_folder';
export const firstTagButton = '/tbody/tr[1]/td[3]/button[1]';
/**
- *
* @param filename
* @param options = {
* tagName: true
* resetSearchButton: true
* reindexing: true
* }
+ * @param executeSearch
* @returns {Promise<void>}
*/
-export async function searchEngine(filename, options = {}) {
+export async function searchEngine(
+ filename,
+ options = {},
+ executeSearch = true
+) {
if (!(await isDisplayed('#textQuery'))) {
await clickOn('[data-tid=toggleSearch]');
}
await typeInputValue('#textQuery', filename);
- if (!(await isDisplayed('[data-tid=searchAdvancedTID]'))) {
- await clickOn('[data-tid=advancedSearch]');
- }
- if (options.tagName) {
- await setInputValue('[data-tid=searchTagsAndTID] input', filename);
- }
+ if (executeSearch) {
+ if (!(await isDisplayed('[data-tid=searchAdvancedTID]'))) {
+ await clickOn('[data-tid=advancedSearch]');
+ }
+ if (options.tagName) {
+ await setInputValue('[data-tid=searchTagsAndTID] input', filename);
+ }
- if (options.reindexing) {
- await clickOn('[data-tid=forceIndexingTID]');
- }
- if (options.searchType) {
- await clickOn('[data-tid=' + options.searchType + ']');
- } else {
- await clickOn('[data-tid=strictSearchTID]');
- }
+ if (options.reindexing) {
+ await clickOn('[data-tid=forceIndexingTID]');
+ }
+ if (options.searchType) {
+ await clickOn('[data-tid=' + options.searchType + ']');
+ } else {
+ await clickOn('[data-tid=strictSearchTID]');
+ }
- if (options.resetSearchButton) {
- await clickOn('#resetSearchButton');
- } else {
- await clickOn('#searchButtonAdvTID');
+ if (options.resetSearchButton) {
+ await clickOn('#resetSearchButton');
+ } else {
+ await clickOn('#searchButtonAdvTID');
+ }
+ await waitForNotification('TIDSearching');
}
- await waitForNotification('TIDSearching');
}
/**
diff --git a/tests/e2e/welcome.helpers.js b/tests/e2e/welcome.helpers.js
index 9c9f53434..45250cced 100644
--- a/tests/e2e/welcome.helpers.js
+++ b/tests/e2e/welcome.helpers.js
@@ -19,7 +19,7 @@ export async function closeWelcomePlaywright() {
const el = await global.client.waitForSelector(
'[data-tid=closeOnboardingDialog]',
{
- timeout: 3000,
+ timeout: 5000,
state: 'visible'
}
);
diff --git a/tests/setup-after-env.js b/tests/setup-after-env.js
index 3340fbb6c..aa681e796 100644
--- a/tests/setup-after-env.js
+++ b/tests/setup-after-env.js
@@ -53,8 +53,6 @@ jest.retryTimes(3); //, { logErrorsBeforeRetry: true });
beforeEach(async () => {
if (global.isPlaywright) {
- // await closeWelcomePlaywright();
-
if (global.isWeb) {
await global.client.evaluate(() => {
window.history.pushState('', document.title, window.location.pathname);
@@ -62,6 +60,7 @@ beforeEach(async () => {
});
await global.client.reload();
} else {
+ await closeWelcomePlaywright();
await clearStorage();
}