Skip to content

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

fix: e2e tests after adding sub-menus to some context menus

Ilian Sapundshiev1573a84b48ad
diff --git a/capacitor/ios/App/App.xcodeproj/project.pbxproj b/capacitor/ios/App/App.xcodeproj/project.pbxproj
index f26e1333b..1c1f4b4b6 100644
--- a/capacitor/ios/App/App.xcodeproj/project.pbxproj
+++ b/capacitor/ios/App/App.xcodeproj/project.pbxproj
@@ -319,7 +319,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 10260;
+ CURRENT_PROJECT_VERSION = 10262;
DEVELOPMENT_TEAM = DLK22E2679;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -345,7 +345,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 10260;
+ CURRENT_PROJECT_VERSION = 10262;
DEVELOPMENT_TEAM = DLK22E2679;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index bd8776fb8..60e211aa1 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -5,7 +5,12 @@ import AppConfig from '../../src/renderer/AppConfig';
import { dataTidFormat } from '../../src/renderer/services/test';
import { getS3File } from '../s3rver/S3DataRefresh';
import { createFileS3, createLocalFile, delay } from './hook';
-import { firstFile, openContextEntryMenu, toContainTID } from './test-utils';
+import {
+ clickOnMenuOperation,
+ firstFile,
+ openContextEntryMenu,
+ toContainTID,
+} from './test-utils';
import fse from 'fs-extra';
import {
@@ -1146,7 +1151,7 @@ export async function reloadDirectory() {
export async function createNewDirectory(dirName = testFolder) {
await isDisplayed('[data-tid=folderContainerOpenDirMenu]', true, 8000);
await clickOn('[data-tid=folderContainerOpenDirMenu]');
- await clickOn('[data-tid=newSubDirectory]');
+ await clickOnMenuOperation('newSubDirectory');
// set new dir name
await setInputValue('[data-tid=directoryName] input', dirName);
await clickOn('[data-tid=confirmCreateNewDirectory]');
@@ -1157,21 +1162,21 @@ export async function createNewDirectory(dirName = testFolder) {
export async function newHTMLFile() {
await clickOn('[data-tid=folderContainerOpenDirMenu]');
- await clickOn('[data-tid=createHTMLTextFileTID]');
+ await clickOnMenuOperation('createHTMLTextFileTID');
await clickOn('[data-tid=createTID]');
await waitForNotification();
}
export async function newMDFile() {
await clickOn('[data-tid=folderContainerOpenDirMenu]');
- await clickOn('[data-tid=createNewMarkdownFileTID]');
+ await clickOnMenuOperation('createNewMarkdownFileTID');
await clickOn('[data-tid=createTID]');
await waitForNotification();
}
export async function createTxtFile() {
await clickOn('[data-tid=folderContainerOpenDirMenu]');
- await clickOn('[data-tid=createNewTextFileTID]');
+ await clickOnMenuOperation('createNewTextFileTID');
await clickOn('[data-tid=createTID]');
await waitForNotification();
}
diff --git a/tests/e2e/test-utils.js b/tests/e2e/test-utils.js
index c38883456..ab1b809bf 100644
--- a/tests/e2e/test-utils.js
+++ b/tests/e2e/test-utils.js
@@ -8,10 +8,44 @@ export const firstFile = '/span';
export const firstFolder = '/div';
export const firstFileName = '/span/div/div/div/p';
-export async function openContextEntryMenu(selector, menuOperation) {
- // selector is current selector location for element in perspectiveGridTable or perspectiveListTable (full xpath path to element)
- // menuOption is selector for current menu operation
- await clickOn(selector, { button: 'right' });
+// Menu entries that were moved into hover-opened submenus (FileMenu "Open ▸"
+// and the directory menu "New ▸"). Maps a leaf menu-item TID to the parent
+// submenu trigger that must be opened before the leaf becomes visible.
+const submenuParentTid = {
+ fileMenuOpenFile: 'fileMenuOpen',
+ fileMenuOpenParentFolderInternally: 'fileMenuOpen',
+ fileMenuOpenFileNatively: 'fileMenuOpen',
+ createNewTextFileTID: 'createNewSubmenuTID',
+ createNewMarkdownFileTID: 'createNewSubmenuTID',
+ createHTMLTextFileTID: 'createNewSubmenuTID',
+ createNewLinkFileTID: 'createNewSubmenuTID',
+ createNewFromTemplateTID: 'createNewSubmenuTID',
+ createNewAudioTID: 'createNewSubmenuTID',
+ newSubDirectory: 'createNewSubmenuTID',
+ addExistingFile: 'createNewSubmenuTID',
+};
+
+// Resolve the parent submenu trigger for a menu operation, if it lives in a
+// submenu. "Open with extension" entries use a dynamic `openWith-*` TID.
+function getSubmenuParentTid(menuOperation) {
+ if (submenuParentTid[menuOperation]) {
+ return submenuParentTid[menuOperation];
+ }
+ return menuOperation.startsWith('openWith-') ? 'fileMenuOpen' : undefined;
+}
+
+// Click a menu operation in an already-open menu, opening its parent submenu
+// first when the entry has been nested into one.
+export async function clickOnMenuOperation(menuOperation) {
+ const parentTid = getSubmenuParentTid(menuOperation);
+ if (parentTid) {
+ const parentSelector = '[data-tid=' + parentTid + ']';
+ await global.client.waitForSelector(parentSelector, {
+ state: 'visible',
+ timeout: 5000,
+ });
+ await clickOn(parentSelector);
+ }
const menuSelector = '[data-tid=' + menuOperation + ']';
await global.client.waitForSelector(menuSelector, {
state: 'visible',
@@ -20,6 +54,13 @@ export async function openContextEntryMenu(selector, menuOperation) {
await clickOn(menuSelector);
}
+export async function openContextEntryMenu(selector, menuOperation) {
+ // selector is current selector location for element in perspectiveGridTable or perspectiveListTable (full xpath path to element)
+ // menuOption is selector for current menu operation
+ await clickOn(selector, { button: 'right' });
+ await clickOnMenuOperation(menuOperation);
+}
+
/**
* @deprecated use getGridFileName(fileIndex) instead
* @param filename