Skip to content

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

chore: small adjustments in the e2e tests

Ilian Sapundshievb2848638de80
diff --git a/tests/e2e/folder.pw.e2e.js b/tests/e2e/folder.pw.e2e.js
index 31b797e49..f3f0b0bc9 100644
--- a/tests/e2e/folder.pw.e2e.js
+++ b/tests/e2e/folder.pw.e2e.js
@@ -5,6 +5,7 @@ import { AddRemovePropertiesTags } from './file.properties.helpers';
import { expect, test } from './fixtures';
import {
clickOn,
+ clickOnIfVisible,
createNewDirectory,
deleteDirectory,
expectElementExist,
@@ -187,7 +188,7 @@ test.describe('TST01 - Folder management', () => {
await clickOn('[data-tid=confirmCreateNewDirectory]');
await clickOn('[data-tid=MoveTarget' + folderToMove + ']');
await clickOn('[data-tid=confirmMoveFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=location_' + defaultLocationName + ']');
await expectElementExist(getGridFileSelector(testFolder), false, 5000);
await global.client.dblclick('[data-tid=fsEntryName_' + folderToMove + ']');
@@ -218,7 +219,7 @@ test.describe('TST01 - Folder management', () => {
await clickOn('[data-tid=confirmCreateNewDirectory]');
await clickOn('[data-tid=MoveTarget' + folderToCopy + ']');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=location_' + defaultLocationName + ']');
await expectElementExist(getGridFileSelector('empty_folder'), true, 5000);
await global.client.dblclick(getGridFileSelector(folderToCopy));
@@ -274,7 +275,7 @@ test.describe('TST01 - Folder management', () => {
);
await clickOn('[data-tid=MoveTargetempty_folder]');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
const fileName2 = 'sample.jpg';
await openContextEntryMenu(
@@ -283,7 +284,7 @@ test.describe('TST01 - Folder management', () => {
);
await clickOn('[data-tid=MoveTargetempty_folder]');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await openContextEntryMenu(
getGridFileSelector('empty_folder'),
diff --git a/tests/e2e/folderprops.pw.e2e.js b/tests/e2e/folderprops.pw.e2e.js
index 56011ae5c..c20d632ca 100644
--- a/tests/e2e/folderprops.pw.e2e.js
+++ b/tests/e2e/folderprops.pw.e2e.js
@@ -11,6 +11,7 @@ import {
addDescription,
checkSettings,
clickOn,
+ clickOnIfVisible,
createLocation,
createNewDirectory,
dnd,
@@ -184,7 +185,7 @@ test.describe('TST02 - Folder properties', () => {
await clickOn('[data-tid=gridPerspectiveCopySelectedFiles]'); //todo moveCopyEntryTID
await clickOn('[data-tid=MoveTarget' + targetFolder + ']');
await clickOn('[data-tid=confirmMoveFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await expectElementExist(getGridFileSelector(newFolder), false, 5000);
await global.client.dblclick('[data-tid=fsEntryName_' + targetFolder + ']');
await expectElementExist(getGridFileSelector(newFolder), true, 5000);
@@ -252,7 +253,7 @@ test.describe('TST02 - Folder properties', () => {
);
await clickOn('[data-tid=MoveTargetempty_folder]');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=changePerspectiveTID]', {
// force: true,
timeout: 15000,
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 5f42b45bb..66a207be2 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -62,6 +62,22 @@ export async function clickOn(selector, options = { timeout: 15000 }) {
}
}
+/**
+ * Click an element if it's visible, otherwise silently skip.
+ * Use for optional UI elements like upload dialogs that may auto-dismiss.
+ */
+export async function clickOnIfVisible(selector, timeout = 3000) {
+ try {
+ await global.client.waitForSelector(selector, {
+ state: 'visible',
+ timeout,
+ });
+ await global.client.click(selector);
+ } catch (e) {
+ // Element didn't appear — that's OK for optional UI
+ }
+}
+
export async function rightClickOn(selector) {
const options = { button: 'right' };
return clickOn(selector, options);
diff --git a/tests/e2e/perspective-grid-right-button.pw.e2e.js b/tests/e2e/perspective-grid-right-button.pw.e2e.js
index 0eaad4dc1..996a03590 100644
--- a/tests/e2e/perspective-grid-right-button.pw.e2e.js
+++ b/tests/e2e/perspective-grid-right-button.pw.e2e.js
@@ -7,6 +7,7 @@ import AppConfig from '../../src/renderer/AppConfig';
import { expect, test } from './fixtures';
import {
clickOn,
+ clickOnIfVisible,
createNewDirectory,
createTxtFile,
expectElementExist,
@@ -350,7 +351,7 @@ test.describe('TST50** - Right button on a file', () => {
await openContextEntryMenu(fileSelector, 'fileMenuMoveCopyFile');
await clickOn('[data-tid=navigateToParentTID]');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await clickOn('[data-tid=gridPerspectiveOnBackButton]');
await expectElementExist(fileSelector, true);
diff --git a/tests/e2e/perspective-grid.pw.e2e.js b/tests/e2e/perspective-grid.pw.e2e.js
index 242306f24..d24344def 100644
--- a/tests/e2e/perspective-grid.pw.e2e.js
+++ b/tests/e2e/perspective-grid.pw.e2e.js
@@ -8,6 +8,7 @@ import {
import { expect, test } from './fixtures';
import {
clickOn,
+ clickOnIfVisible,
expectAllFileSelected,
expectElementExist,
expectElementSelected,
@@ -165,7 +166,7 @@ test.describe('TST50 - Perspective Grid', () => {
await clickOn('[data-tid=gridPerspectiveCopySelectedFiles]');
await clickOn('[data-tid=MoveTargetempty_folder]');
await clickOn('[data-tid=confirmCopyFiles]');
- await clickOn('[data-tid=uploadCloseAndClearTID]');
+ await clickOnIfVisible('[data-tid=uploadCloseAndClearTID]');
await global.client.dblclick(getGridFileSelector('empty_folder'));
await expectElementExist(getGridFileSelector(fileName));