Skip to content

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

e2e changes

sytolk9158274aac74
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 0470d345a..84c60e84e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -137,6 +137,6 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
- # yarn build-main
+ # yarn build:main
# yarn build-e2e
# yarn test-playwright
diff --git a/.github/workflows/workflow_scheduled_mac_electron.yml b/.github/workflows/workflow_scheduled_mac_electron.yml
index 80af7869b..90ef9b691 100644
--- a/.github/workflows/workflow_scheduled_mac_electron.yml
+++ b/.github/workflows/workflow_scheduled_mac_electron.yml
@@ -32,7 +32,7 @@ jobs:
run: npm run test-unit
- name: Run Electron tests
run: |
- npm run build-main
+ npm run build:main
npm run build-e2e
npm run test-playwright
- uses: actions/upload-artifact@v3
diff --git a/.github/workflows/workflow_scheduled_mac_minio.yml.disabled b/.github/workflows/workflow_scheduled_mac_minio.yml.disabled
index e33b215dc..e49afac64 100644
--- a/.github/workflows/workflow_scheduled_mac_minio.yml.disabled
+++ b/.github/workflows/workflow_scheduled_mac_minio.yml.disabled
@@ -45,7 +45,7 @@ jobs:
- name: Run Electron tests
run: |
yarn install-ext-node
- yarn build-main
+ yarn build:main
yarn build-e2e
yarn test-e2e-electron-minio
- uses: actions/upload-artifact@v2
diff --git a/.github/workflows/workflow_scheduled_win_electron.disabled b/.github/workflows/workflow_scheduled_win_electron.disabled
index 6deeb9081..f81c87e21 100644
--- a/.github/workflows/workflow_scheduled_win_electron.disabled
+++ b/.github/workflows/workflow_scheduled_win_electron.disabled
@@ -32,7 +32,7 @@ jobs:
run: npm run test-unit
- name: Run Electron tests
run: |
- npm run build-main
+ npm run build:main
npm run build-e2e
npm run test-playwright
- uses: IgnusG/[email protected]
@@ -76,7 +76,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-playwright
# - uses: actions/upload-artifact@v2
@@ -126,7 +126,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-e2e-electron-minio
# - uses: actions/upload-artifact@v2
@@ -176,7 +176,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-e2e-web
# - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/workflow_scheduled_win_electron_pro.yml b/.github/workflows/workflow_scheduled_win_electron_pro.yml
index 5abb72f9c..bfce737d9 100644
--- a/.github/workflows/workflow_scheduled_win_electron_pro.yml
+++ b/.github/workflows/workflow_scheduled_win_electron_pro.yml
@@ -39,7 +39,7 @@ jobs:
run: npm run test-unit
- name: Run Electron tests
run: |
- npm run build-main
+ npm run build:main
npm run build-e2e
npm run test-playwright-pro
- uses: actions/upload-artifact@v3
@@ -78,7 +78,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-playwright
# - uses: actions/upload-artifact@v2
@@ -128,7 +128,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-e2e-electron-minio
# - uses: actions/upload-artifact@v2
@@ -178,7 +178,7 @@ jobs:
# - name: Run Electron tests
# run: |
# yarn install-ext
-# yarn build-main
+# yarn build:main
# yarn build-e2e
# yarn test-e2e-web
# - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/workflow_scheduled_win_minio.yml.disabled b/.github/workflows/workflow_scheduled_win_minio.yml.disabled
index 96cfbff0e..593ef9e30 100644
--- a/.github/workflows/workflow_scheduled_win_minio.yml.disabled
+++ b/.github/workflows/workflow_scheduled_win_minio.yml.disabled
@@ -44,7 +44,7 @@ jobs:
- name: Run Electron tests
run: |
yarn install-ext-node
- yarn build-main
+ yarn build:main
yarn build-e2e
yarn test-e2e-electron-minio
- uses: IgnusG/[email protected]
diff --git a/package.json b/package.json
index 6a4d34728..22162d43c 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,9 @@
"build:web:dev": "rimraf web/dist && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.web.dev.ts",
"build:cordova": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.prod.ts",
"build:cordova:dev": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.dev.ts",
+ "build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build",
+ "build-e2e-dev": "ts-node ./.erb/scripts/clean.js dist && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:web\"",
+ "build-e2e-web": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro && npm run build:web",
"postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && npm run prepare-node && npm run build:dll",
"lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
"package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never && npm run build:dll",
@@ -44,12 +47,6 @@
"browserslist:update": "npx browserslist@latest --update-db",
"bs": "npm run build && npm run start",
"prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions",
- "build-dll": "webpack --config ./configs/webpack.config.renderer.dev.dll.babel.js",
- "build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build",
- "build-e2e-dev": "rimraf release/app/dist && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build-main\" \"npm run build-renderer\" \"npm run build-web-dev\"",
- "build-e2e-web": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro && npm run build-web",
- "build-main": "webpack --config ./configs/webpack.config.main.prod.babel.js",
- "build-renderer": "webpack --config ./configs/webpack.config.renderer.prod.babel.js",
"bump-version": "cd src/renderer && npm run version && cd .. && npm run version-meta",
"clean": "npx rimraf node_modules && npx rimraf src/renderer/dist",
"clean-maps": "rimraf app/dist/**/*.map && rimraf web/dist/**/*.map",
@@ -80,15 +77,15 @@
"postlint-styles-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{css,scss}'",
"minio-start": "./tests/bin/minio server ./tests/testdata-tmp/file-structure",
"minio-start-windows": ".\\tests\\bin\\minio.exe server ./tests/testdata-tmp/file-structure",
- "package:old": "npm run build && npm run package-win && npm run package-linux && npm run package-mac && npm run package-web",
"package-android": "npm run build:cordova && cd cordova && npm install && cordova build --release android",
"package-ci": "npm run postinstall && npm run build && electron-builder --publish always",
- "package-linux": "npm run install-ext-node-linux && electron-builder --linux --config resources/builder.json",
- "package-linux-pro": "npm run install-ext-node-linux && electron-builder --linux --config extensions/tagspacespro/resources/builder-pro.json",
- "package-mac": "npm run install-ext-node-mac && electron-builder --mac --x64 --config resources/builder.json",
- "package-mac-arm64": "npm run install-ext-node-mac-arm64 && electron-builder --mac --arm64 --config resources/builder.json",
- "package-mac-arm64-pro": "npm run install-ext-node-mac-arm64 && electron-builder --mac --arm64 --config extensions/tagspacespro/resources/builder-pro.json",
- "package-mac-pro": "npx cross-env DEBUG_PROD=true && npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --mac --x64 --config extensions/tagspacespro/resources/builder-pro.json --publish never && npm run build:dll",
+ "package-linux": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js dist && electron-builder --linux --config resources/builder.json",
+ "package-linux-pro": "npm run install-ext-node-linux && ts-node ./.erb/scripts/clean.js dist && electron-builder --linux --config extensions/tagspacespro/resources/builder-pro.json",
+ "package-mac": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --x64 --config resources/builder.json",
+ "package-mac-arm64": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --arm64 --config resources/builder.json",
+ "package-mac-arm64-pro": "npm run install-ext-node-mac-arm64 && ts-node ./.erb/scripts/clean.js dist && electron-builder --mac --arm64 --config extensions/tagspacespro/resources/builder-pro.json",
+ "package-mac-pro": "npm run install-ext-node-mac && ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --mac --x64 --config extensions/tagspacespro/resources/builder-pro.json --publish never && npm run build:dll",
+ "package-mac-pro-dev": "npx cross-env DEBUG_PROD=true && npm run package-mac-pro",
"package-pro": "rimraf app/node_modules && node scripts/enablepro.js && npm run install-ext-node && npm run build && npm run package-web-pro && npm run clean-maps && npm run package-win-pro && npm run package-linux-pro && npm run package-web-pro && npm run package-mac-pro",
"package-web": "npm run prepare-web && zip -r ../builds/tagspaces-web.zip web -xi web/files/**\\* ",
"package-web-pro": "npm run prepare-web-pro && zip -r ../builds/tagspaces-pro-web.zip web -xi web/files/**\\* ",
diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.js
index 011e8ccbc..456aa7365 100644
--- a/tests/e2e/fileopener.pw.e2e.js
+++ b/tests/e2e/fileopener.pw.e2e.js
@@ -32,7 +32,7 @@ import {
import { openContextEntryMenu } from './test-utils';
import { createFile, startTestingApp, stopApp, testDataRefresh } from './hook';
import { clearDataStorage } from './welcome.helpers';
-import { dataTidFormat } from '../../app/services/test';
+import { dataTidFormat } from '../../src/renderer/services/test';
test.beforeAll(async () => {
await startTestingApp('extconfig.js');
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index b9922441f..dc5c85bf2 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -3,8 +3,8 @@ import path from 'path';
import { expect } from '@playwright/test';
import { delay } from './hook';
import { firstFile, toContainTID } from './test-utils';
-import AppConfig from '../../app/AppConfig';
-import { dataTidFormat } from '../../app/services/test';
+import AppConfig from '../../src/renderer/AppConfig';
+import { dataTidFormat } from '../../src/renderer/services/test';
export const defaultLocationPath =
'./testdata-tmp/file-structure/supported-filestypes';
diff --git a/tests/e2e/general.pw.e2e.js b/tests/e2e/general.pw.e2e.js
index f4ad221e6..816ef2bfe 100644
--- a/tests/e2e/general.pw.e2e.js
+++ b/tests/e2e/general.pw.e2e.js
@@ -2,7 +2,7 @@
* Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
*/
import { expect, test } from '@playwright/test';
-import AppConfig from '../../app/AppConfig';
+import AppConfig from '../../src/renderer/AppConfig';
import {
defaultLocationPath,
defaultLocationName,
@@ -10,8 +10,6 @@ import {
createPwLocation,
} from './location.helpers';
import {
- reloadDirectory,
- tsFolder,
createNewDirectory,
newHTMLFile,
newMDFile,
@@ -20,14 +18,12 @@ import {
clickOn,
expectElementExist,
selectorFile,
- setSettings,
takeScreenshot,
createTxtFile,
expectMetaFilesExist,
getGridFileSelector,
isDisplayed,
} from './general.helpers';
-import { searchEngine } from './search.helpers';
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { clearDataStorage } from './welcome.helpers';
diff --git a/tests/e2e/hook.js b/tests/e2e/hook.js
index 2c753cc84..4843bf9f7 100644
--- a/tests/e2e/hook.js
+++ b/tests/e2e/hook.js
@@ -138,7 +138,16 @@ export async function startTestingApp(extconfig) {
// Launch Electron app.
global.app = await electron.launch({
args: [
- pathLib.join(__dirname, '..', '..', 'app', 'main.prod.js'),
+ pathLib.join(
+ __dirname,
+ '..',
+ '..',
+ 'release',
+ 'app',
+ 'dist',
+ 'main',
+ 'main.js',
+ ),
// `--user-data-dir=${tempDir.path}`,
'--integration-testing',
'--no-sandbox',
diff --git a/tests/e2e/quick-access.pw.e2e.js b/tests/e2e/quick-access.pw.e2e.js
index 40f96ffcf..cdcd59494 100644
--- a/tests/e2e/quick-access.pw.e2e.js
+++ b/tests/e2e/quick-access.pw.e2e.js
@@ -20,7 +20,7 @@ import {
import { startTestingApp, stopApp, testDataRefresh } from './hook';
import { createSavedSearch, searchEngine } from './search.helpers';
import { openContextEntryMenu } from './test-utils';
-import { dataTidFormat } from '../../app/services/test';
+import { dataTidFormat } from '../../src/renderer/services/test';
import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';
test.beforeAll(async () => {
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index 379f0172c..546bb7210 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -13,7 +13,7 @@ import {
waitForNotification,
} from './general.helpers';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
-import { findAction } from '../../app/components/SearchOptions';
+import { findAction } from '../../src/renderer/components/SearchOptions';
export const regexQuery = '!"#$%&\'()*+,-./@:;<=>[\\]^_`{|}~';
export const searchTag = 'tag1';
diff --git a/tests/e2e/search.pw.e2e.js b/tests/e2e/search.pw.e2e.js
index 2c230f4cf..b5a9e4794 100644
--- a/tests/e2e/search.pw.e2e.js
+++ b/tests/e2e/search.pw.e2e.js
@@ -36,7 +36,7 @@ import {
} from './search.helpers';
import { clearDataStorage } from './welcome.helpers';
import { openContextEntryMenu } from './test-utils';
-import { dataTidFormat } from '../../app/services/test';
+import { dataTidFormat } from '../../src/renderer/services/test';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
test.beforeAll(async () => {