Skip to content

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

add TST0627

Stanimirf1ac8891be41
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index 5de5637c4..32b27671a 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -23,6 +23,17 @@ export const testFilename = 'sample.desktop';
export const emptyFolderName = 'empty_folder';
export const firstTagButton = '/tbody/tr[1]/td[3]/button[1]';
+export async function addSearchCommand(command, executeSearch = true) {
+ if (!(await isDisplayed('#textQuery'))) {
+ await clickOn('[data-tid=toggleSearch]');
+ }
+ await typeInputValue('#textQuery', command);
+ await global.client.keyboard.press('Enter');
+ if (executeSearch) {
+ await global.client.keyboard.press('Enter');
+ await global.client.keyboard.press('Enter');
+ }
+}
/**
* @param filename
* @param options = {
diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.js
index c36c62109..17d4b89db 100644
--- a/tests/e2e/search.pw.e2e.js
+++ b/tests/e2e/search.pw.e2e.js
@@ -22,11 +22,13 @@ import {
searchEngine,
testFilename,
addRemoveTagsInSearchResults,
- createSavedSearch
+ createSavedSearch,
+ addSearchCommand
} from './search.helpers';
import { init } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
import { dataTidFormat } from '../../app/services/test';
+import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
test.beforeAll(async () => {
await startTestingApp('extconfig-with-welcome.js');
@@ -190,6 +192,51 @@ test.describe('TST06 - Test Search in file structure:', () => {
await expectElementExist(getGridFileSelector('sample.jpg'), false, 5000);
});
+ test('TST0627 - Search q. comp - +tag -tag |tag [web,electron]', async () => {
+ // Add 3 files tags
+ const file1 = 'txt';
+ const tags1 = ['test-tag1'];
+ const tags2 = ['test-tag1', 'test-tag2'];
+ const tags3 = ['test-tag2', 'test-tag3'];
+ await clickOn('[data-tid="fsEntryName_sample.' + file1 + '"]');
+ await AddRemoveTagsToSelectedFiles(tags1, true);
+
+ const file2 = 'jpg';
+ await clickOn('[data-tid="fsEntryName_sample.' + file2 + '"]');
+ await AddRemoveTagsToSelectedFiles(tags2, true);
+
+ const file3 = 'gif';
+ await clickOn('[data-tid="fsEntryName_sample.' + file3 + '"]');
+ await AddRemoveTagsToSelectedFiles(tags3, true);
+
+ function getFileName(fileExt, tags) {
+ return (
+ '[data-tid="fsEntryName_sample[' +
+ tags.join(' ') +
+ '].' +
+ fileExt +
+ '"]'
+ );
+ }
+ // Search for + one tag only: test-tag2
+ 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);
+
+ // Search for | tag - tag
+ await addSearchCommand('|' + tags2[1], true);
+ await expectElementExist(getFileName(file1, tags1), false, 5000);
+ await expectElementExist(getFileName(file2, tags2), true, 5000);
+ await expectElementExist(getFileName(file3, tags3), false, 5000);
+
+ // Search for - tag
+ await addSearchCommand('-' + tags3[1], true);
+ await expectElementExist(getFileName(file1, tags1), false, 5000);
+ await expectElementExist(getFileName(file2, tags2), true, 5000);
+ await expectElementExist(getFileName(file3, tags3), false, 5000);
+ });
+
test('TST0639 - Add/Remove sidecar tags in search results [web,electron]', async () => {
await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
await addRemoveTagsInSearchResults(['sidecar-tag5', 'sidecar-tag6']);