Skip to content

Commit d45bf56

Browse files
authored
Merge origin/4.x into feat/custom-screenshot-path
- Resolve all merge conflicts, accepting 4.x as base - Retain feature: screenshotOutputFolder now supports absolute paths and relative subdirectory paths (e.g. 'custom/debug.png' -> output/custom/debug.png) - Use path.isAbsolute() for cross-platform compatibility - Create subdirectories automatically when output dir exists - Update tests and docs to reflect new behavior
1 parent e6945d4 commit d45bf56

216 files changed

Lines changed: 20929 additions & 223 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.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Acceptance Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- '3.x'
7+
pull_request:
8+
branches:
9+
- '**'
10+
11+
env:
12+
CI: true
13+
# Force terminal colors. @see https://www.npmjs.com/package/colors
14+
FORCE_COLOR: 1
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
20+
strategy:
21+
matrix:
22+
node-version: [20.x]
23+
24+
steps:
25+
# Checkout the repository
26+
- name: Checkout Repository
27+
uses: actions/checkout@v5
28+
29+
# Install Docker Compose
30+
- name: Install Docker Compose
31+
run: |
32+
sudo apt-get update --allow-releaseinfo-change
33+
sudo apt-get install -y docker-compose
34+
35+
# Build Docker images to include latest code changes
36+
- name: Build Docker Images
37+
run: docker-compose build
38+
working-directory: test
39+
40+
# Run WebDriverIO acceptance tests using docker-compose
41+
- name: Run WebDriverIO Acceptance Tests
42+
run: docker-compose run --rm test-acceptance.webdriverio
43+
working-directory: test

.github/workflows/publish-beta.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Publish to npm
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
permissions:
8+
contents: write
9+
id-token: write
10+
11+
jobs:
12+
publish:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v6
17+
with:
18+
ref: ${{ github.event.release.target_commitish }}
19+
20+
- uses: actions/setup-node@v6
21+
with:
22+
node-version: 24
23+
registry-url: 'https://registry.npmjs.org'
24+
25+
- run: npm install
26+
- run: npm install -g npm@latest
27+
28+
- name: Generate TypeScript definitions
29+
run: npm run def
30+
31+
- name: Set package version
32+
run: |
33+
TAG="${{ github.event.release.tag_name }}"
34+
VERSION="${TAG#v}"
35+
npm version "$VERSION" --no-git-tag-version
36+
37+
- name: Publish to npm
38+
run: |
39+
TAG="${{ github.event.release.tag_name }}"
40+
if [ "${{ github.event.release.prerelease }}" = "true" ] || echo "$TAG" | grep -qE 'rc|beta'; then
41+
echo "Publishing $TAG with 'beta' dist-tag"
42+
npm publish --provenance --tag beta
43+
else
44+
echo "Publishing $TAG with 'latest' dist-tag"
45+
npm publish --provenance
46+
fi
47+
48+
- name: Trigger website deployment
49+
run: |
50+
curl -fsS -X POST \
51+
-H "Authorization: Bearer ${{ secrets.GH_WEBSITE_TRIGGER_PAT }}" \
52+
-H "Accept: application/vnd.github+json" \
53+
https://api.github.com/repos/codeceptjs/website/dispatches \
54+
-d '{"event_type":"codeceptjs-release"}'

.mocharc.cjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const path = require('path')
2+
3+
module.exports = {
4+
require: [path.join(__dirname, 'test', 'support', 'setup.mjs')],
5+
extension: ['js', 'mjs'],
6+
}

0 commit comments

Comments
 (0)