Skip to content

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

add new folder.pw.e2e tests

sytolk1449ecb008d6
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index 9a1638e44..a97abf63b 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -765,6 +765,7 @@ function GridPerspective(props: Props) {
>
<MainToolbar
classes={classes}
+ prefixDataTID={'grid'}
layoutType={layoutType.current}
isReadOnlyMode={props.isReadOnlyMode}
selectedEntries={selectedEntries}
diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsx
index d55fa06b1..76d41e83e 100644
--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx
+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx
@@ -45,10 +45,10 @@ import { getKeyBindingObject } from '-/reducers/settings';
import { getAllPropertiesPromise } from '-/services/utils-io';
import { TS } from '-/tagspaces.namespace';
import { actions as AppActions } from '-/reducers/app';
-import PlatformIO from '-/services/platform-facade';
interface Props {
classes: any;
+ prefixDataTID?: string;
isReadOnlyMode: boolean;
selectedEntries: Array<TS.FileSystemEntry>;
loadParentDirectoryContent: () => void;
@@ -74,6 +74,7 @@ interface Props {
function MainToolbar(props: Props) {
const {
classes,
+ prefixDataTID,
selectedEntries,
toggleSelectAllFiles,
someFileSelected,
@@ -107,7 +108,10 @@ function MainToolbar(props: Props) {
}
return (
- <Toolbar className={classes.topToolbar} data-tid="perspectiveGridToolbar">
+ <Toolbar
+ className={classes.topToolbar}
+ data-tid={prefixDataTID + 'perspectiveToolbar'}
+ >
<Tooltip
title={
i18n.t('core:navigateToParentDirectory') +
@@ -118,7 +122,7 @@ function MainToolbar(props: Props) {
>
<IconButton
aria-label={i18n.t('core:navigateToParentDirectory')}
- data-tid="gridPerspectiveOnBackButton"
+ data-tid={prefixDataTID + 'PerspectiveOnBackButton'}
onClick={() => {
if (
props.searchQuery &&
@@ -144,7 +148,7 @@ function MainToolbar(props: Props) {
}
>
<IconButton
- data-tid="gridPerspectiveSelectAllFiles"
+ data-tid={prefixDataTID + 'PerspectiveSelectAllFiles'}
onClick={toggleSelectAllFiles}
size="large"
>
@@ -173,7 +177,7 @@ function MainToolbar(props: Props) {
<span>
<IconButton
aria-label={i18n.t('core:tagSelectedEntries')}
- data-tid="gridPerspectiveAddRemoveTags"
+ data-tid={prefixDataTID + 'PerspectiveAddRemoveTags'}
disabled={selectedEntries.length < 1}
onClick={openAddRemoveTagsDialog}
size="large"
@@ -188,7 +192,7 @@ function MainToolbar(props: Props) {
<span>
<IconButton
aria-label={i18n.t('core:copyMoveSelectedEntries')}
- data-tid="gridPerspectiveCopySelectedFiles"
+ data-tid={prefixDataTID + 'PerspectiveCopySelectedFiles'}
disabled={selectedEntries.length < 1}
onClick={openMoveCopyFilesDialog}
size="large"
@@ -210,7 +214,7 @@ function MainToolbar(props: Props) {
<span>
<IconButton
aria-label={i18n.t('core:deleteSelectedEntries')}
- data-tid="gridPerspectiveDeleteMultipleFiles"
+ data-tid={prefixDataTID + 'PerspectiveDeleteMultipleFiles'}
onClick={openDeleteFileDialog}
size="large"
>
@@ -223,7 +227,7 @@ function MainToolbar(props: Props) {
<IconButton
// title={i18n.t('core:sort')}
aria-label={i18n.t('core:sort')}
- data-tid="gridPerspectiveSortMenu"
+ data-tid={prefixDataTID + 'PerspectiveSortMenu'}
onClick={e => {
handleSortingMenu(e);
}}
@@ -236,7 +240,7 @@ function MainToolbar(props: Props) {
!AppConfig.isCordovaAndroid && ( // https://trello.com/c/z6ESlqxz/697-exports-to-json-or-csv-do-not-work-on-android
<Tooltip title={i18n.t('core:exportCsv')}>
<IconButton
- data-tid="gridPerspectiveExportCsvMenuTID"
+ data-tid={prefixDataTID + 'PerspectiveExportCsvMenuTID'}
onClick={props.handleExportCsvMenu}
style={{ transform: 'scale(-1, 1)' }}
size="large"
@@ -247,7 +251,7 @@ function MainToolbar(props: Props) {
)}
<Tooltip title={i18n.t('core:perspectiveSettingsTitle')}>
<IconButton
- data-tid="gridPerspectiveOptionsMenu"
+ data-tid={prefixDataTID + 'PerspectiveOptionsMenu'}
onClick={openSettings}
size="large"
>
diff --git a/app/perspectives/list/components/MainContainer.tsx b/app/perspectives/list/components/MainContainer.tsx
index 4e508e20c..e3a72d7cb 100644
--- a/app/perspectives/list/components/MainContainer.tsx
+++ b/app/perspectives/list/components/MainContainer.tsx
@@ -765,6 +765,7 @@ function GridPerspective(props: Props) {
>
<MainToolbar
classes={classes}
+ prefixDataTID={'list'}
layoutType={layoutType.current}
isReadOnlyMode={props.isReadOnlyMode}
selectedEntries={selectedEntries}
diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.js
index 547586905..10a94f50c 100644
--- a/tests/e2e/fileopener.pw.e2e.js
+++ b/tests/e2e/fileopener.pw.e2e.js
@@ -328,8 +328,6 @@ test.describe('TST08 - File folder properties', () => {
test.skip('TST0821 - Toggle File Properties [electron]', async () => {});
- test.skip('TST0822 - Open Folder Properties [electron]', async () => {});
-
test.skip('TST0823 - Show thumbnail in the properties if available [Pro]', async () => {});
test.skip('TST0824 - Change file thumbnail / Reset thumbnail [Pro]', async () => {});
diff --git a/tests/e2e/folder.pw.e2e.js b/tests/e2e/folder.pw.e2e.js
index f9c004add..2d989bc3d 100644
--- a/tests/e2e/folder.pw.e2e.js
+++ b/tests/e2e/folder.pw.e2e.js
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
-import { test } from '@playwright/test';
+import { expect, test } from '@playwright/test';
import {
defaultLocationPath,
defaultLocationName,
@@ -23,6 +23,7 @@ import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
import { clearDataStorage } from './welcome.helpers';
import { emptyFolderName } from './search.helpers';
import { AddRemovePropertiesTags } from './file.properties.helpers';
+import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
test.beforeAll(async () => {
await startTestingApp('extconfig.js');
@@ -187,16 +188,94 @@ test.describe('TST01 - Folder management', () => {
await testDataRefresh();
});
- test.skip('TST0110 - Tag folder [web,minio,electron]', async () => {
+ test('TST0110 - Tag folder [web,minio,electron]', async () => {
+ await clickOn('[data-tid=fsEntryName_empty_folder]');
+ await AddRemoveTagsToSelectedFiles(['test-tag1']);
+ await expectElementExist('[data-tid=tagContainer_test-tag1]', true, 5000);
/*await openContextEntryMenu(
'[data-tid=fsEntryName_empty_folder]',
'fileMenuMoveCopyDirectoryTID'
);*/
});
- test.skip('TST0111 - Open folder properties [TODO]', async () => {});
+ test('TST0111 - Open folder properties [web,minio,electron]', async () => {
+ await openContextEntryMenu(
+ '[data-tid=fsEntryName_empty_folder]',
+ 'showProperties'
+ );
+ const divElement = await global.client.$(
+ '[data-tid=OpenedTIDsupported-filestypes]'
+ ); // Replace 'div' with your selector
+ const divText = await divElement.innerText();
+ expect(divText).toEqual('empty_folder');
+ });
- test.skip('TST0112 - Delete non empty folder by disabled trashcan should not be possible [electron, TODO]', async () => {});
+ test('TST0112 - Delete non empty folder by disabled trashcan [web,minio,electron]', async () => {
+ await openContextEntryMenu(
+ '[data-tid=fsEntryName_empty_folder]',
+ 'deleteDirectory'
+ );
+ await clickOn('[data-tid=confirmDeleteFileDialog]');
+ await expectElementExist(
+ '[data-tid=fsEntryName_empty_folder]',
+ false,
+ 5000
+ );
+ });
- test.skip('TST0113 - Delete not empty folder to trashcan [electron, TODO]', async () => {});
+ test.skip('TST0113 - Delete not empty folder to trashcan [electron]', async () => {});
+
+ test('TST0116 - Switch to Grid Perspective [web,minio,electron]', async () => {
+ await clickOn('[data-tid=openListPerspective]');
+ await expectElementExist('[data-tid=listPerspectiveContainer]', true, 5000);
+ await clickOn('[data-tid=openDefaultPerspective]');
+ await expectElementExist('[data-tid=listPerspectiveContainer]', false);
+ await expectElementExist('[data-tid=gridPerspectiveContainer]', true, 5000);
+ await clickOn('[data-tid=gridPerspectiveOptionsMenu]');
+ await expectElementExist(
+ '[data-tid=gridPerspectiveToggleShowDirectories]',
+ true,
+ 5000
+ );
+ });
+
+ test('TST0117 - Switch to List Perspective [web,minio,electron]', async () => {
+ await clickOn('[data-tid=openListPerspective]');
+ await expectElementExist('[data-tid=gridPerspectiveContainer]', false);
+ await expectElementExist('[data-tid=listPerspectiveContainer]', true, 5000);
+ await expectElementExist(
+ '[data-tid=listPerspectiveOptionsMenu]',
+ true,
+ 5000
+ );
+ });
+
+ test('TST0118 - Switch to Gallery Perspective [web,minio,electron,_pro]', async () => {
+ await clickOn('[data-tid=openGalleryPerspective]');
+ await expectElementExist(
+ '[data-tid=perspectiveGalleryToolbar]',
+ true,
+ 5000
+ );
+ await expectElementExist('[data-tid=perspectiveGalleryHelp]', true, 5000);
+ });
+
+ test('TST0119 - Switch to Mapique Perspective [web,minio,electron,_pro]', async () => {
+ await clickOn('[data-tid=openMapiquePerspective]');
+ await expectElementExist(
+ '[data-tid=perspectiveMapiqueToolbar]',
+ true,
+ 5000
+ );
+ await expectElementExist('[data-tid=perspectiveMapiqueHelp]', true, 5000);
+ });
+
+ test('TST0120 - Switch to Kanban Perspective [web,minio,electron,_pro]', async () => {
+ await clickOn('[data-tid=openKanbanPerspective]');
+ await expectElementExist(
+ '[data-tid=kanbanSettingsDialogOpenTID]',
+ true,
+ 5000
+ );
+ });
});
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 875530c6e..376317d75 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -27,7 +27,7 @@ export async function takeScreenshot(testInfo, title = 'failure') {
path: sPath,
contentType: 'image/png'
});
- await global.client.screenshot({ path: sPath });
+ return await global.client.screenshot({ path: sPath });
}
export async function clickOn(selector, options = { timeout: 15000 }) {
diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.js
index 1168325f9..d85f97e73 100644
--- a/tests/e2e/search.pw.e2e.js
+++ b/tests/e2e/search.pw.e2e.js
@@ -353,15 +353,19 @@ test.describe('TST06 - Test Search in file structure:', () => {
await expectElementExist(selectorFile, false, 5000);
});
- test('TST0635 - Search q. comp - scope (global) [electron]', async () => {
- await createFile('fulltext.txt', 'testing fulltext');
-
- await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ test('TST0635 - Search q. comp - scope (global) [web,electron]', async () => {
+ // await clickOn('[data-tid=location_' + defaultLocationName + ']');
await addSearchCommand('sc:', false);
await clickOn('#textQuery-option-2');
await addSearchCommand('sample.html', true);
await expectElementExist(getGridFileSelector('sample.html'), true, 5000);
- await clickOn('#clearSearchID');
+ });
+
+ /**
+ * for web fulltext index is not created in tsi.json
+ */
+ test('TST0636 - Search q. fulltext in content [electron]', async () => {
+ await createFile('fulltext.txt', 'testing fulltext');
await addSearchCommand('sc:', false);
await clickOn('#textQuery-option-2');
@@ -369,12 +373,12 @@ test.describe('TST06 - Test Search in file structure:', () => {
await expectElementExist(getGridFileSelector('fulltext.txt'), true, 5000);
});
- test('TST0642 - Add/Remove sidecar tags in search results [web,electron]', async () => {
+ test('TST0637 - Add/Remove sidecar tags in search results [web,electron]', async () => {
await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);
await addRemoveTagsInSearchResults(['sidecar-tag5', 'sidecar-tag6']);
});
- test('TST0643 - Add/Remove filename tags in search results [web,electron]', async () => {
+ test('TST0638 - Add/Remove filename tags in search results [web,electron]', async () => {
await addRemoveTagsInSearchResults(['filename-tag5', 'filename-tag6']);
});
});