diff --git a/.circleci/build.sh b/.circleci/build.sh deleted file mode 100755 index a749511a1..000000000 --- a/.circleci/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd test - -docker-compose build -docker-compose pull php selenium.chrome - diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e95c7baba..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,48 +0,0 @@ -version: 2.1 - -orbs: - browser-tools: circleci/browser-tools@1.4.5 - -defaults: &defaults - machine: - image: default - docker_layer_caching: false - steps: - - checkout - - run: .circleci/build.sh - - browser-tools/install-chrome: - chrome-version: 124.0.6358.0 - replace-existing: true - - run: - command: docker-compose run --rm test-acceptance.puppeteer - working_directory: test - when: always - - run: - command: docker-compose run --rm test-rest - working_directory: test - when: always - - run: - command: docker-compose run --rm test-graphql - working_directory: test - when: always - - run: - command: docker-compose run --rm test-acceptance.webdriverio - working_directory: test - when: always - - run: - command: docker-compose run --rm test-bdd.faker - working_directory: test - when: always - -jobs: - docker: - <<: *defaults - environment: - - NODE_VERSION: 18.16.0 - -workflows: - version: 2 - - test_all: - jobs: - - docker diff --git a/.circleci/test.sh b/.circleci/test.sh deleted file mode 100755 index 07ebced15..000000000 --- a/.circleci/test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e - -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 diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml new file mode 100644 index 000000000..ac4c23589 --- /dev/null +++ b/.github/workflows/acceptance-tests.yml @@ -0,0 +1,48 @@ +name: Acceptance Tests using docker compose + +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-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + # Checkout the repository + - 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 + + # Run rest tests using docker-compose + - name: Run REST Tests + run: docker-compose run --rm test-rest + working-directory: test + + # Run WebDriverIO acceptance tests using docker-compose + - name: Run WebDriverIO Acceptance Tests + run: docker-compose run --rm test-acceptance.webdriverio + working-directory: test + + # Run faker BDD tests using docker-compose + - name: Run Faker BDD Tests + run: docker-compose run --rm test-bdd.faker + working-directory: test diff --git a/test/acceptance/coverage_test.js b/test/acceptance/coverage_test.js index bae31c345..2a4c37706 100644 --- a/test/acceptance/coverage_test.js +++ b/test/acceptance/coverage_test.js @@ -2,8 +2,6 @@ const { I } = inject(); Feature('Plugins'); -Feature('TODO mvc demo'); - Before(() => { I.amOnPage('https://todomvc.com/examples/react/dist/'); diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 2f9893f69..a52ae4381 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -1,60 +1,17 @@ version: '3' services: - test-unit: - build: .. - entrypoint: /codecept/node_modules/.bin/mocha - command: test/unit - working_dir: /codecept - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules - - test-runner: - image: node:12.13-slim - entrypoint: /codecept/node_modules/.bin/mocha - command: test/runner - working_dir: /codecept - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules - - test-helpers: - build: .. - entrypoint: /codecept/node_modules/.bin/mocha --invert --fgrep Appium - command: test/helper - working_dir: /codecept - env_file: .env - depends_on: - - selenium.chrome - - php - - json_server - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules - test-rest: - build: .. - entrypoint: /codecept/node_modules/.bin/mocha + <<: &test-service + build: .. + entrypoint: /codecept/node_modules/.bin/mocha + working_dir: /codecept + env_file: .env + volumes: + - ..:/codecept + - node_modules:/codecept/node_modules command: test/rest - working_dir: /codecept - env_file: .env depends_on: - json_server - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules - - test-graphql: - build: .. - entrypoint: /codecept/node_modules/.bin/mocha - command: test/graphql - working_dir: /codecept - env_file: .env - depends_on: - - json_server-graphql - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules test-acceptance.webdriverio: build: .. @@ -84,20 +41,6 @@ services: - ./support:/support - node_modules:/node_modules - test-acceptance.testcafe: - build: .. - env_file: .env - environment: - # TODO Add a testcafe tag - - CODECEPT_ARGS=-c codecept.Testcafe.js --grep @Puppeteer - depends_on: - - php - volumes: - - ./acceptance:/tests - - ./data:/data - - ./support:/support - - node_modules:/node_modules - test-bdd.faker: build: .. env_file: .env @@ -124,29 +67,14 @@ services: - .:/test json_server: - build: .. + <<: *test-service entrypoint: [] command: npm run json-server - working_dir: /codecept expose: - 8010 - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules - - json_server-graphql: - build: .. - entrypoint: [] - command: npm run json-server:graphql - working_dir: /codecept - expose: - - 8020 - volumes: - - ..:/codecept - - node_modules:/codecept/node_modules puppeteer-image: - image: ghcr.io/puppeteer/puppeteer:21.1.1 + image: ghcr.io/puppeteer/puppeteer:22.4.1 volumes: node_modules: