fix conflict

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.4.5
+  browser-tools: circleci/browser-tools@1.4.8
 
 defaults: &defaults
   machine:
@@ -11,12 +11,8 @@ defaults: &defaults
     - checkout
     - run: .circleci/build.sh
     - browser-tools/install-chrome:
-        chrome-version: 116.0.5845.96
-        replace-existing: true
-    - run:
-        command: docker-compose run --rm test-acceptance.puppeteer
-        working_directory: test
-        when: always
+        chrome-version: latest # TODO: remove until: https://github.com/CircleCI-Public/browser-tools-orb/issues/75
+        replace-existing: true # TODO: remove until: https://github.com/CircleCI-Public/browser-tools-orb/issues/75
     - run:
         command: docker-compose run --rm test-rest
         working_directory: test

.circleci/test.sh

@@ -6,5 +6,4 @@ cd test
 
 docker-compose run --rm test-unit &&
 docker-compose run --rm test-rest &&
-docker-compose run --rm test-acceptance.webdriverio &&
-docker-compose run --rm test-acceptance.puppeteer
+docker-compose run --rm test-acceptance.webdriverio

.eslintrc.js

@@ -0,0 +1,63 @@
+module.exports = {
+  extends: 'airbnb-base',
+  env: {
+    node: true,
+  },
+  parserOptions: {
+    ecmaVersion: 2020,
+  },
+  rules: {
+    'func-names': 0,
+    'no-use-before-define': 0,
+    'no-unused-vars': 0,
+    'no-underscore-dangle': 0,
+    'no-undef': 0,
+    'prefer-destructuring': 0,
+    'no-param-reassign': 0,
+    'max-len': 0,
+    camelcase: 0,
+    'no-shadow': 0,
+    'consistent-return': 0,
+    'no-console': 0,
+    'global-require': 0,
+    'class-methods-use-this': 0,
+    'no-plusplus': 0,
+    'no-return-assign': 0,
+    'prefer-rest-params': 0,
+    'no-useless-escape': 0,
+    'no-restricted-syntax': 0,
+    'no-unused-expressions': 0,
+    'guard-for-in': 0,
+    'no-multi-assign': 0,
+    'require-yield': 0,
+    'prefer-spread': 0,
+    'import/no-dynamic-require': 0,
+    'no-continue': 0,
+    'no-mixed-operators': 0,
+    'default-case': 0,
+    'import/no-extraneous-dependencies': 0,
+    'no-cond-assign': 0,
+    'import/no-unresolved': 0,
+    'no-await-in-loop': 0,
+    'arrow-body-style': 0,
+    'no-loop-func': 0,
+    'arrow-parens': 0,
+    'default-param-last': 0,
+    semi: 0,
+    'operator-linebreak': 0,
+    'nonblock-statement-body-position': 0,
+    curly: 0,
+    'implicit-arrow-linebreak': 0,
+    indent: 0,
+    'object-curly-newline': 0,
+    'semi-style': 0,
+    'function-paren-newline': 0,
+    'prefer-template': 0,
+    'newline-per-chained-call': 0,
+    'prefer-arrow-callback': 0,
+    'no-bitwise': 0,
+    'prefer-const': 0,
+    'no-extra-semi': 0,
+  },
+  ignorePatterns: ['test/data/output', 'lib/css2xpath/*'],
+};

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,6 +33,7 @@ Applicable plugins:
 - [ ] :fire: Breaking changes
 - [ ] :rocket: New functionality
 - [ ] :bug: Bug fix
+- [ ] 🧹 Chore
 - [ ] :clipboard: Documentation changes/updates
 - [ ] :hotsprings: Hot fix
 - [ ] :hammer: Markdown files fix - not related to source code

.github/dependabot.yml

@@ -17,4 +17,6 @@ updates:
         versions: [">=5.0"]
       - dependency-name: "apollo-server-express"
         versions: [">=3.0"]
-
+      - dependency-name: "eslint"
+        versions: [ ">8.57.0" ]
+

.github/workflows/acceptance-tests.yml

@@ -27,10 +27,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
-      # Run acceptance tests using docker-compose
-      - name: Run Puppeteer Acceptance Tests
-        run: docker-compose run --rm test-acceptance.puppeteer
-        working-directory: test
+      # Install Docker Compose
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
 
       # Run rest tests using docker-compose
       - name: Run REST Tests

.github/workflows/check.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: testomatio/check-tests@master
+    - uses: testomatio/check-tests@stable
       if: github.repository == 'codeceptjs/CodeceptJS' && github.event.pull_request.title == '3.x'
       with:
         framework: mocha

.github/workflows/docker.yml

@@ -4,43 +4,36 @@ on:
   push:
     branches:
       - 3.x
-  # Build and push Docker images *only* for releases.
   release:
-    types: [published] # , created, edited
+    types: [published]
 
 jobs:
   push_to_registry:
     name: Build and push Docker image to Docker Hub
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Check out the repo with latest code
+      - name: Check out the repo with the latest code
         uses: actions/checkout@v4
-      - name: Push latest to Docker Hub
-        uses: docker/build-push-action@v4 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
-          tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
-          tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
-          tags: latest
 
-      - name: 'Get the current tag'
+      - name: Get the current tag
         id: currentTag
-        uses: actions/checkout@v4
-      - run: git fetch --prune --unshallow && TAG=$(git describe --tags --abbrev=0) && echo $TAG && echo "TAG="$TAG >> "$GITHUB_ENV"
-      - name: Check out the repo with tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.TAG }}
+        run: git fetch --prune --unshallow && TAG=$(git describe --tags --abbrev=0) && echo $TAG && echo "TAG="$TAG >> "$GITHUB_ENV"
 
-      - name: Push current tag to Docker Hub
-        uses: docker/build-push-action@v1 # Info: https://github.com/docker/build-push-action/tree/releases/v1#tags
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ secrets.DOCKERHUB_REPOSITORY }}
-          tag_with_ref: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_ref
-          tag_with_sha: true # Info: https://github.com/docker/build-push-action/tree/releases/v1#tag_with_sha
-          tags: ${{ env.TAG }}
+          context: .
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_REPOSITORY }}:latest
+            ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ env.TAG }}

.github/workflows/softExpectHelper.yml

@@ -0,0 +1,34 @@
+name: Soft Expect Helper Tests
+
+on:
+  push:
+    branches:
+      - 3.x
+  pull_request:
+    branches:
+      - '**'
+
+env:
+  CI: true
+  # Force terminal colors. @see https://www.npmjs.com/package/colors
+  FORCE_COLOR: 1
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install
+      run: npm i --force
+    - name: run unit tests
+      run: ./node_modules/.bin/mocha test/helper/SoftExpect_test.js --timeout 5000

.hound.yml

@@ -1,3 +1,3 @@
 eslint:
   enabled: true
-  config_file: .eslintrc.json
+  config_file: .eslintrc.js

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run lint && npm run dtslint
+npm run prettier && npm run lint && npm run dtslint