Skip to content

Commit 1ff35dd

Browse files
committed
Rebase 3.x (#5282)
1 parent 088dab4 commit 1ff35dd

File tree

165 files changed

+4582
-1916
lines changed

Some content is hidden

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

165 files changed

+4582
-1916
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Depending on a type of a change you should do the following.
3030

3131
## Helpers
3232

33-
Please keep in mind that CodeceptJS have **unified API** for WebDriverIO, Appium, Protractor, Nightmare, Puppeteer, TestCafe. Tests written using those helpers should be compatible at syntax level. However, some of helpers may contain unique methods. That happens. If, for instance, WebDriverIO has method XXX and Nightmare doesn't, you can implement XXX inside Nightmare using the same method signature.
33+
Please keep in mind that CodeceptJS have **unified API** for WebDriver, Appium, Playwright, and Puppeteer. Tests written using those helpers should be compatible at syntax level. However, some of helpers may contain unique methods. That happens. If, for instance, WebDriver has method XXX and Playwright doesn't, you can implement XXX inside Playwright using the same method signature.
3434

35-
### Updating a WebDriverIO | Nightmare
35+
### Updating a WebDriver | Playwright | Puppeteer
3636

3737
*Whenever a new method or new behavior is added it should be documented in a docblock. Valid JS-example is required! Do **not edit** `docs/helpers/`, those files are generated from docblocks in corresponding helpers! *
3838

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* CodeceptJS version:
2020
* NodeJS Version:
2121
* Operating System:
22-
* puppeteer || webdriverio || testcafe version (if related)
22+
* puppeteer || webdriverio || playwright version (if related)
2323
* Configuration file:
2424

2525
```js

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Applicable helpers:
1010
- [ ] REST
1111
- [ ] FileHelper
1212
- [ ] Appium
13-
- [ ] TestCafe
1413

1514
Applicable plugins:
1615

.github/workflows/acceptance-tests.yml renamed to .github/workflows/acceptance-tests.yml.disabled

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
sudo apt-get update --allow-releaseinfo-change
3333
sudo apt-get install -y docker-compose
3434

35-
# Run rest tests using docker-compose
36-
- name: Run REST Tests
37-
run: docker-compose run --rm test-rest
35+
# Build Docker images to include latest code changes
36+
- name: Build Docker Images
37+
run: docker-compose build
3838
working-directory: test
3939

4040
# Run WebDriverIO acceptance tests using docker-compose

.github/workflows/appium_Android.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- 3.x
77
- 5228-fix-appium-tests
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
913
env:
1014
CI: true
1115
# Force terminal colors. @see https://www.npmjs.com/package/colors
@@ -27,7 +31,7 @@ jobs:
2731
- uses: actions/checkout@v5
2832

2933
- name: Use Node.js ${{ matrix.node-version }}
30-
uses: actions/setup-node@v6
34+
uses: actions/setup-node@v5
3135
with:
3236
node-version: ${{ matrix.node-version }}
3337

.github/workflows/appium_iOS.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- 3.x
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10+
cancel-in-progress: true
11+
812
env:
913
CI: true
1014
# Force terminal colors. @see https://www.npmjs.com/package/colors
@@ -26,7 +30,7 @@ jobs:
2630
steps:
2731
- uses: actions/checkout@v5
2832
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v6
33+
uses: actions/setup-node@v5
3034
with:
3135
node-version: ${{ matrix.node-version }}
3236
- run: npm i --force

.github/workflows/check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
branches:
77
- '**'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
test:
1115
runs-on: ubuntu-22.04

.github/workflows/doc-generation.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- 3.x
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
update-documentation:
1014
runs-on: ubuntu-22.04
@@ -18,7 +22,7 @@ jobs:
1822
uses: actions/checkout@v5
1923

2024
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v6
25+
uses: actions/setup-node@v5
2226
with:
2327
node-version: ${{ matrix.node-version }}
2428

.github/workflows/docker.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
branches:
66
- 3.x
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
push_to_registry:
1014
name: Build and push Docker image to Docker Hub

.github/workflows/dtslint.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@ on:
88
branches:
99
- '**'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
test:
1317
runs-on: ubuntu-22.04
1418
strategy:
1519
matrix:
1620
node-version: [20.x]
1721
steps:
18-
- uses: actions/checkout@v5
19-
- name: Use Node.js ${{ matrix.node-version }}
20-
uses: actions/setup-node@v6
21-
with:
22-
node-version: ${{ matrix.node-version }}
23-
- run: npm i --force
24-
env:
25-
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true
26-
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
27-
- run: npm run def
28-
- run: npm run dtslint
22+
- uses: actions/checkout@v5
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v5
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
- run: npm i --force
28+
env:
29+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: true
30+
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
31+
- run: npm run def
32+
- run: npm run dtslint

0 commit comments

Comments
 (0)