Skip to content

E2e/feature/desktop tests refactoring #2666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 10, 2023
Merged

E2e/feature/desktop tests refactoring #2666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96a517d
desktop tests refactoring
vlad-dargel Oct 6, 2023
33733f5
update path in config.yml
vlad-dargel Oct 6, 2023
4b7376f
fixes
vlad-dargel Oct 6, 2023
32dfd9a
add desktop tests from web
vlad-dargel Oct 9, 2023
5717b87
add e2e desktop tests to feature/main branches workflows
vlad-dargel Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ jobs:
- run:
name: .AppImage tests
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
.circleci/e2e/test.app-image.sh
- when:
condition:
Expand Down Expand Up @@ -409,7 +409,7 @@ jobs:
- run: choco install nodejs --version=18.15.0
- run:
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
.circleci/e2e/test.exe.cmd
shell: bash.exe
- when:
Expand Down Expand Up @@ -460,7 +460,7 @@ jobs:
- run:
name: Run tests
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
docker-compose \
-f tests/e2e/rte.docker-compose.yml \
Expand All @@ -474,7 +474,7 @@ jobs:
- run:
name: Run tests
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
docker-compose \
-f tests/e2e/rte.docker-compose.yml \
Expand Down Expand Up @@ -1208,6 +1208,18 @@ workflows:
requires:
- itest-code
# E2E tests
- setup-sign-certificates:
name: Setup sign certificates (stage)
requires:
- Start All Tests
- setup-build:
name: Setup build (stage)
requires:
- Setup sign certificates (stage)
- linux:
name: Build app - Linux (stage)
requires:
- Setup build (stage)
- docker:
name: Build docker image
requires:
Expand All @@ -1218,6 +1230,11 @@ workflows:
parallelism: 4
requires:
- Build docker image
- e2e-app-image:
name: E2ETest (AppImage)
parallelism: 2
requires:
- Build app - Linux (stage)
# Approve to build
- approve:
name: Build App
Expand Down
7 changes: 2 additions & 5 deletions tests/e2e/desktop.runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ import testcafe from 'testcafe';
configPath: 'tsconfig.testcafe.json',
experimentalDecorators: true
}})
.src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
.src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
.browsers(['electron'])
.filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
return testMeta.env == 'desktop'
})
.screenshots({
path: 'report/screenshots/',
path: './report/screenshots/',
takeOnFails: true,
pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png',
})
Expand Down
5 changes: 1 addition & 4 deletions tests/e2e/desktop.runner.win.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ import testcafe from 'testcafe';
configPath: 'tsconfig.testcafe.json',
experimentalDecorators: true
}})
.src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
.src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
.browsers(['electron'])
.filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
return testMeta.env == 'desktop' && testMeta.rte === 'standalone';
})
.screenshots({
path: 'report/screenshots/',
takeOnFails: true,
Expand Down
92 changes: 0 additions & 92 deletions tests/e2e/tests/critical-path/database/modules.e2e.ts
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions tests/e2e/tests/critical-path/files-auto-update/promo-button-autoupdate.e2e.ts
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions tests/e2e/tests/critical-path/monitor/monitor.e2e.ts
View file
Open in desktop

This file was deleted.

Loading