Skip to content

Commit aaeff04

Browse files
committed
Merge branch '3.x' into fix-appium-touchPerform
2 parents 3de75b8 + 16f05d2 commit aaeff04

File tree

6 files changed

+43
-35
lines changed

6 files changed

+43
-35
lines changed

.github/workflows/docker.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,20 @@ jobs:
1010
name: Build and push Docker image to Docker Hub
1111
runs-on: ubuntu-22.04
1212
env:
13-
DOCKER_REPO: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}
13+
DOCKER_REPO: ${{ secrets.DOCKERHUB_REPOSITORY }}
1414

1515
steps:
16-
- name: Fetch full Git history and tags
16+
- name: Checkout code
1717
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020

21-
- name: Get the latest tag
22-
id: get_tag
21+
- name: Get version from package.json
22+
id: get_version
2323
run: |
24-
TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
25-
echo "TAG=$TAG" >> $GITHUB_ENV
26-
echo "::set-output name=tag::$TAG"
27-
28-
- name: Checkout latest tag
29-
run: git checkout tags/${{ env.TAG }}
24+
VERSION=$(jq -r .version package.json)
25+
echo "VERSION=$VERSION" >> $GITHUB_ENV
26+
echo "version=$VERSION" >> $GITHUB_OUTPUT
3027
3128
- name: Set up Docker Buildx
3229
uses: docker/setup-buildx-action@v3
@@ -37,19 +34,19 @@ jobs:
3734
username: ${{ secrets.DOCKERHUB_USERNAME }}
3835
password: ${{ secrets.DOCKERHUB_PASSWORD }}
3936

40-
- name: Check if Docker tag exists
37+
- name: Check if Docker tag exists on Docker Hub
4138
id: tag_check
4239
run: |
43-
TAG_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" \
44-
https://hub.docker.com/v2/repositories/${DOCKER_REPO}/tags/${TAG}/)
45-
echo "exists=$TAG_EXISTS" >> $GITHUB_OUTPUT
40+
STATUS_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
41+
https://hub.docker.com/v2/repositories/${{ env.DOCKER_REPO }}/tags/${{ steps.get_version.outputs.version }}/)
42+
echo "status_code=$STATUS_CODE" >> $GITHUB_OUTPUT
4643
4744
- name: Build and push Docker image
48-
if: steps.tag_check.outputs.exists != '200'
45+
if: steps.tag_check.outputs.status_code != '200'
4946
uses: docker/build-push-action@v6
5047
with:
5148
context: .
5249
push: true
5350
tags: |
5451
${{ env.DOCKER_REPO }}:latest
55-
${{ env.DOCKER_REPO }}:${{ env.TAG }}
52+
${{ env.DOCKER_REPO }}:${{ env.VERSION }}

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
"publish-beta": "./runok.js publish:next-beta-version"
7676
},
7777
"dependencies": {
78-
"@codeceptjs/configure": "1.0.4",
78+
"@codeceptjs/configure": "1.0.6",
7979
"@codeceptjs/helper": "2.0.4",
8080
"@cucumber/cucumber-expressions": "18",
81-
"@cucumber/gherkin": "32.1.0",
81+
"@cucumber/gherkin": "32.1.2",
8282
"@cucumber/messages": "27.2.0",
8383
"@xmldom/xmldom": "0.9.8",
8484
"acorn": "8.14.1",
@@ -105,8 +105,8 @@
105105
"lodash.clonedeep": "4.5.0",
106106
"lodash.merge": "4.6.2",
107107
"mkdirp": "3.0.1",
108-
"mocha": "11.2.2",
109-
"monocart-coverage-reports": "2.12.4",
108+
"mocha": "11.6.0",
109+
"monocart-coverage-reports": "2.12.6",
110110
"ms": "2.1.3",
111111
"ora-classic": "5.4.2",
112112
"parse-function": "5.6.10",
@@ -124,28 +124,28 @@
124124
"@codeceptjs/expect-helper": "^1.0.2",
125125
"@codeceptjs/mock-request": "0.3.1",
126126
"@eslint/eslintrc": "3.3.1",
127-
"@eslint/js": "9.24.0",
128-
"@faker-js/faker": "9.6.0",
127+
"@eslint/js": "9.30.0",
128+
"@faker-js/faker": "9.8.0",
129129
"@pollyjs/adapter-puppeteer": "6.0.6",
130130
"@pollyjs/core": "6.0.6",
131131
"@types/chai": "5.2.1",
132132
"@types/inquirer": "9.0.7",
133-
"@types/node": "22.14.1",
133+
"@types/node": "24.0.2",
134134
"@wdio/sauce-service": "9.12.5",
135135
"@wdio/selenium-standalone-service": "8.15.0",
136-
"@wdio/utils": "9.12.5",
136+
"@wdio/utils": "9.15.0",
137137
"@xmldom/xmldom": "0.9.8",
138138
"chai": "^4.0.0",
139139
"chai-as-promised": "7.1.2",
140140
"chai-subset": "1.6.0",
141141
"documentation": "14.0.3",
142-
"electron": "36.2.0",
142+
"electron": "36.4.0",
143143
"eslint": "^9.24.0",
144-
"eslint-plugin-import": "2.31.0",
145-
"eslint-plugin-mocha": "11.0.0",
144+
"eslint-plugin-import": "2.32.0",
145+
"eslint-plugin-mocha": "11.1.0",
146146
"expect": "29.7.0",
147147
"express": "5.1.0",
148-
"globals": "16.0.0",
148+
"globals": "16.2.0",
149149
"graphql": "16.10.0",
150150
"graphql-tag": "^2.12.6",
151151
"husky": "9.1.7",
@@ -154,21 +154,21 @@
154154
"jsdoc-typeof-plugin": "1.0.0",
155155
"json-server": "0.17.4",
156156
"mochawesome": "^7.1.3",
157-
"playwright": "1.52.0",
157+
"playwright": "1.53.0",
158158
"prettier": "^3.3.2",
159159
"puppeteer": "24.8.0",
160160
"qrcode-terminal": "0.12.0",
161161
"rosie": "2.1.1",
162162
"runok": "0.9.3",
163-
"semver": "7.7.1",
164-
"sinon": "20.0.0",
163+
"semver": "7.7.2",
164+
"sinon": "21.0.0",
165165
"sinon-chai": "3.7.0",
166166
"testcafe": "3.7.2",
167-
"ts-morph": "25.0.1",
167+
"ts-morph": "26.0.0",
168168
"ts-node": "10.9.2",
169169
"tsd": "^0.32.0",
170170
"tsd-jsdoc": "2.5.0",
171-
"typedoc": "0.28.4",
171+
"typedoc": "0.28.7",
172172
"typedoc-plugin-markdown": "4.6.3",
173173
"typescript": "5.8.3",
174174
"wdio-docker-service": "3.2.1",

test/acceptance/config_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Scenario('change config 5 @WebDriverIO @Puppeteer @Playwright', ({ I }) => {
3232

3333
Scenario('make API call and check response @Playwright', ({ I }) => {
3434
I.amOnPage('/')
35-
I.makeApiRequest('get', 'https://reqres.in/api/users?page=2')
35+
I.makeApiRequest('get', 'https://reqres.in/api/users?page=2', { headers: {'x-api-key': 'reqres-free-v1'}})
3636
I.seeResponseCodeIsSuccessful()
3737
})
3838

test/rest/REST_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ describe('REST', () => {
150150
})
151151

152152
it('should be able to parse JSON responses', async () => {
153-
await I.sendGetRequest('https://reqres.in/api/comments/1')
153+
await I.sendGetRequest('https://reqres.in/api/comments/1', { 'x-api-key': 'reqres-free-v1'})
154154
await jsonResponse.seeResponseCodeIsSuccessful()
155155
await jsonResponse.seeResponseContainsKeys(['data', 'support'])
156156
})

typings/jsdoc.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = {
99
'./lib/container.js',
1010
'./lib/data/table.js',
1111
'./lib/data/dataTableArgument.js',
12+
'./lib/effects.js',
1213
'./lib/event.js',
1314
'./lib/index.js',
1415
'./lib/locator.js',

typings/tests/global-variables.types.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,13 @@ expectType<void>(AfterSuite((args) => {
8383
// @ts-ignore
8484
expectType<CodeceptJS.I>(args.I)
8585
}))
86+
87+
// @ts-ignore
88+
expectType<Promise<boolean>>(tryTo(() => {
89+
return true;
90+
}));
91+
92+
// @ts-ignore
93+
expectType<Promise<boolean>>(tryTo(async () => {
94+
return false;
95+
}));

0 commit comments

Comments
 (0)