Skip to content

Commit 2b62f7b

Browse files
kobenguyentkobenguyent
committed
fix conflict
2 parents fb98821 + e338b56 commit 2b62f7b

Some content is hidden

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

76 files changed

+4945
-600
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
browser-tools: circleci/[email protected].5
4+
browser-tools: circleci/[email protected].8
55

66
defaults: &defaults
77
machine:
@@ -11,12 +11,8 @@ defaults: &defaults
1111
- checkout
1212
- run: .circleci/build.sh
1313
- browser-tools/install-chrome:
14-
chrome-version: 116.0.5845.96
15-
replace-existing: true
16-
- run:
17-
command: docker-compose run --rm test-acceptance.puppeteer
18-
working_directory: test
19-
when: always
14+
chrome-version: latest # TODO: remove until: https://github.com/CircleCI-Public/browser-tools-orb/issues/75
15+
replace-existing: true # TODO: remove until: https://github.com/CircleCI-Public/browser-tools-orb/issues/75
2016
- run:
2117
command: docker-compose run --rm test-rest
2218
working_directory: test

‎.circleci/test.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ cd test
66

77
docker-compose run --rm test-unit &&
88
docker-compose run --rm test-rest &&
9-
docker-compose run --rm test-acceptance.webdriverio &&
10-
docker-compose run --rm test-acceptance.puppeteer
9+
docker-compose run --rm test-acceptance.webdriverio

‎.eslintignore‎

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

‎.eslintrc.js‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
module.exports = {
2+
extends: 'airbnb-base',
3+
env: {
4+
node: true,
5+
},
6+
parserOptions: {
7+
ecmaVersion: 2020,
8+
},
9+
rules: {
10+
'func-names': 0,
11+
'no-use-before-define': 0,
12+
'no-unused-vars': 0,
13+
'no-underscore-dangle': 0,
14+
'no-undef': 0,
15+
'prefer-destructuring': 0,
16+
'no-param-reassign': 0,
17+
'max-len': 0,
18+
camelcase: 0,
19+
'no-shadow': 0,
20+
'consistent-return': 0,
21+
'no-console': 0,
22+
'global-require': 0,
23+
'class-methods-use-this': 0,
24+
'no-plusplus': 0,
25+
'no-return-assign': 0,
26+
'prefer-rest-params': 0,
27+
'no-useless-escape': 0,
28+
'no-restricted-syntax': 0,
29+
'no-unused-expressions': 0,
30+
'guard-for-in': 0,
31+
'no-multi-assign': 0,
32+
'require-yield': 0,
33+
'prefer-spread': 0,
34+
'import/no-dynamic-require': 0,
35+
'no-continue': 0,
36+
'no-mixed-operators': 0,
37+
'default-case': 0,
38+
'import/no-extraneous-dependencies': 0,
39+
'no-cond-assign': 0,
40+
'import/no-unresolved': 0,
41+
'no-await-in-loop': 0,
42+
'arrow-body-style': 0,
43+
'no-loop-func': 0,
44+
'arrow-parens': 0,
45+
'default-param-last': 0,
46+
semi: 0,
47+
'operator-linebreak': 0,
48+
'nonblock-statement-body-position': 0,
49+
curly: 0,
50+
'implicit-arrow-linebreak': 0,
51+
indent: 0,
52+
'object-curly-newline': 0,
53+
'semi-style': 0,
54+
'function-paren-newline': 0,
55+
'prefer-template': 0,
56+
'newline-per-chained-call': 0,
57+
'prefer-arrow-callback': 0,
58+
'no-bitwise': 0,
59+
'prefer-const': 0,
60+
'no-extra-semi': 0,
61+
},
62+
ignorePatterns: ['test/data/output', 'lib/css2xpath/*'],
63+
};

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Applicable plugins:
3333
- [ ] :fire: Breaking changes
3434
- [ ] :rocket: New functionality
3535
- [ ] :bug: Bug fix
36+
- [ ] 🧹 Chore
3637
- [ ] :clipboard: Documentation changes/updates
3738
- [ ] :hotsprings: Hot fix
3839
- [ ] :hammer: Markdown files fix - not related to source code

‎.github/dependabot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ updates:
1717
versions: [">=5.0"]
1818
- dependency-name: "apollo-server-express"
1919
versions: [">=3.0"]
20-
20+
- dependency-name: "eslint"
21+
versions: [ ">8.57.0" ]
22+

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
- name: Checkout Repository
2828
uses: actions/checkout@v3
2929

30-
# Run acceptance tests using docker-compose
31-
- name: Run Puppeteer Acceptance Tests
32-
run: docker-compose run --rm test-acceptance.puppeteer
33-
working-directory: test
30+
# Install Docker Compose
31+
- name: Install Docker Compose
32+
run: |
33+
sudo apt-get update
34+
sudo apt-get install -y docker-compose
3435
3536
# Run rest tests using docker-compose
3637
- name: Run REST Tests

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
17-
- uses: testomatio/check-tests@master
17+
- uses: testomatio/check-tests@stable
1818
if: github.repository == 'codeceptjs/CodeceptJS' && github.event.pull_request.title == '3.x'
1919
with:
2020
framework: mocha

‎.github/workflows/docker.yml‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,36 @@ on:
44
push:
55
branches:
66
- 3.x
7-
# Build and push Docker images *only* for releases.
87
release:
9-
types: [published] # , created, edited
8+
types: [published]
109

1110
jobs:
1211
push_to_registry:
1312
name: Build and push Docker image to Docker Hub
1413
runs-on: ubuntu-22.04
1514

1615
steps:
17-
- name: Check out the repo with latest code
16+
- name: Check out the repo with the latest code
1817
uses: actions/checkout@v4
19-
- name: Push latest to Docker Hub
20-
uses: docker/build-push-action@v4 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
18+
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
22+
- name: Login to Docker Hub
23+
uses: docker/login-action@v3
2124
with:
2225
username: ${{ secrets.DOCKERHUB_USERNAME }}
2326
password: ${{ secrets.DOCKERHUB_PASSWORD }}
24-
repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
25-
tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
26-
tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
27-
tags: latest
2827

29-
- name: 'Get the current tag'
28+
- name: Get the current tag
3029
id: currentTag
31-
uses: actions/checkout@v4
32-
- run: git fetch --prune --unshallow && TAG=$(git describe --tags --abbrev=0) && echo $TAG && echo "TAG="$TAG >> "$GITHUB_ENV"
33-
- name: Check out the repo with tag
34-
uses: actions/checkout@v4
35-
with:
36-
ref: ${{ env.TAG }}
30+
run: git fetch --prune --unshallow && TAG=$(git describe --tags --abbrev=0) && echo $TAG && echo "TAG="$TAG >> "$GITHUB_ENV"
3731

38-
- name: Push current tag to Docker Hub
39-
uses: docker/build-push-action@v1 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
32+
- name: Build and push Docker image
33+
uses: docker/build-push-action@v6
4034
with:
41-
username: ${{ secrets.DOCKERHUB_USERNAME }}
42-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
43-
repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
44-
tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
45-
tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
46-
tags: ${{ env.TAG }}
35+
context: .
36+
push: true
37+
tags: |
38+
${{ secrets.DOCKERHUB_REPOSITORY }}:latest
39+
${{ secrets.DOCKERHUB_REPOSITORY }}:${{ env.TAG }}

‎.github/workflows/softExpectHelper.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Soft Expect Helper 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+
19+
runs-on: ubuntu-22.04
20+
21+
strategy:
22+
matrix:
23+
node-version: [20.x]
24+
25+
steps:
26+
- uses: actions/checkout@v4
27+
- name: Use Node.js ${{ matrix.node-version }}
28+
uses: actions/setup-node@v4
29+
with:
30+
node-version: ${{ matrix.node-version }}
31+
- name: npm install
32+
run: npm i --force
33+
- name: run unit tests
34+
run: ./node_modules/.bin/mocha test/helper/SoftExpect_test.js --timeout 5000

0 commit comments

Comments
 (0)