Skip to content

Commit 896ecdf

Browse files
authored
Merge branch 'develop' into SDESK-7885
2 parents ec54cbe + 7dc2165 commit 896ecdf

177 files changed

Lines changed: 4592 additions & 20606 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-e2e/action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ runs:
1212
working-directory: ./build-tools
1313
shell: bash
1414

15-
- run: npm ci
16-
working-directory: ./end-to-end-testing-helpers
17-
shell: bash
18-
1915
- run: npm ci
2016
working-directory: ./e2e/client
2117
shell: bash
@@ -24,10 +20,6 @@ runs:
2420
working-directory: ./e2e/client
2521
shell: bash
2622

27-
- run: npm run specs--compile
28-
working-directory: ./e2e/client
29-
shell: bash
30-
3123
- run: npm run start-client-server
3224
working-directory: ./e2e/client
3325
shell: bash

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,26 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
cooldown:
13+
default-days: 7
14+
1215
- package-ecosystem: "npm" # See documentation for possible values
1316
directory: "/e2e/client" # Location of package manifests
1417
schedule:
1518
interval: "weekly"
19+
cooldown:
20+
default-days: 7
21+
1622
- package-ecosystem: "pip" # See documentation for possible values
1723
directory: "/e2e/server" # Location of package manifests
1824
schedule:
1925
interval: "weekly"
26+
cooldown:
27+
default-days: 7
28+
2029
- package-ecosystem: "github-actions"
2130
directory: "/"
2231
schedule:
2332
interval: "weekly"
33+
cooldown:
34+
default-days: 7

.github/workflows/tests.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -97,51 +97,3 @@ jobs:
9797
name: playwright-html-report
9898
path: e2e/client/playwright-report
9999
retention-days: 14
100-
101-
protractor-e2e:
102-
runs-on: ubuntu-latest
103-
strategy:
104-
fail-fast: false
105-
matrix:
106-
node-version: ['22', '24']
107-
suite: [a, b]
108-
defaults:
109-
run:
110-
working-directory: e2e/client
111-
steps:
112-
- uses: actions/checkout@v6
113-
- uses: actions/setup-node@v6
114-
with:
115-
node-version: ${{ matrix.node-version }}
116-
cache: 'npm'
117-
118-
- name: Setup E2E Environment
119-
uses: ./.github/actions/setup-e2e
120-
121-
- name: Setup Chrome
122-
uses: browser-actions/setup-chrome@v2
123-
id: setup-chrome
124-
with:
125-
chrome-version: 127.0.6533.99
126-
install-dependencies: true
127-
install-chromedriver: true
128-
129-
- name: Run Protractor
130-
run: npx protractor-flake --parser standard --max-attempts=3 -- protractor.conf.js --suite=${{ matrix.suite }}
131-
env:
132-
CHROME_BIN: ${{ steps.setup-chrome.outputs.chrome-path }}
133-
CHROMEWEBDRIVER: ${{ steps.setup-chrome.outputs.chromedriver-path }}
134-
TRAVIS: ci
135-
SCREENSHOTS_DIR: /tmp
136-
137-
- name: Upload screenshots
138-
if: ${{ failure() }}
139-
uses: actions/upload-artifact@v7
140-
with:
141-
name: screenshots-protractor-node-${{ matrix.node-version }}-${{ matrix.suite }}
142-
path: /tmp/*.png
143-
144-
- name: Server Logs
145-
if: ${{ failure() }}
146-
run: docker compose logs server
147-
working-directory: e2e/server

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ For installation instructions, please refer to the README file at: [https://gith
99

1010
### Running end-to-end tests
1111

12-
`npm run install` - Install dependencies.
12+
End-to-end tests run on Playwright. See `e2e/README.md` for the full workflow.
1313

14-
`npm run build && npm run start-client-server` - Build and serve the bundle. Alternatively `npm run server` can be used serve the bundle in watch mode.
14+
Quick start (from `e2e/client/`):
1515

16-
`npm run start-test-server`
16+
`npm install` - Install dependencies.
1717

18-
`npm run e2e-compile` OR `npm run e2e-compile-watch` - compiles tests from TypeScript to JavaScript.
18+
`npm run build && npm run start-client-server` - Build and serve the bundle. Alternatively `npm run server` can be used to serve the bundle in watch mode.
1919

20-
`npm run protractor` - starts the browser and runs the tests.
20+
`npm run start-test-server` - Start the dockerized backend.
21+
22+
`npm run playwright` - Run all Playwright tests in headless mode. Use `npm run playwright-interactive` for the Playwright UI.
2123

2224
### Contributing
2325

e2e/MIGRATION_REPORT.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

e2e/README-PROTRACTOR.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)