From 0f2e7bcee777b1bd92b5ae2b858848d5ef645222 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Mon, 11 Mar 2024 17:02:32 +0100 Subject: [PATCH 01/20] fix: move from circleci to gha --- .github/workflows/acceptance-tests.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/acceptance-tests.yml diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml new file mode 100644 index 000000000..afd008c68 --- /dev/null +++ b/.github/workflows/acceptance-tests.yml @@ -0,0 +1,21 @@ +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 + +steps: + # need checkout before using compose-action + - uses: actions/checkout@v3 + - uses: isbang/compose-action@v1.5.1 + with: + compose-file: "./test/docker-compose.yml" From 0c99e9e95c141fed6dd10c55b532dcdcb60fd7a2 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Mon, 11 Mar 2024 17:14:41 +0100 Subject: [PATCH 02/20] fix: move from circleci to gha --- .github/workflows/acceptance-tests.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index afd008c68..c9798d47f 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -13,9 +13,18 @@ env: # Force terminal colors. @see https://www.npmjs.com/package/colors FORCE_COLOR: 1 -steps: - # need checkout before using compose-action - - uses: actions/checkout@v3 - - uses: isbang/compose-action@v1.5.1 - with: - compose-file: "./test/docker-compose.yml" +jobs: + build: + + runs-on: ubuntu-22.04 + + strategy: + matrix: + node-version: [20.x] + + steps: + # need checkout before using compose-action + - uses: actions/checkout@v3 + - uses: isbang/compose-action@v1.5.1 + with: + compose-file: "./test/docker-compose.yml" From b21859a251caa2740732dc3d2da7f8217200dfd0 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Mon, 11 Mar 2024 17:28:01 +0100 Subject: [PATCH 03/20] fix: move from circleci to gha --- test/docker-compose.yml | 46 ----------------------------------------- 1 file changed, 46 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 2f9893f69..a2544048e 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -1,37 +1,5 @@ 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 @@ -84,20 +52,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 From 9e2c83d69ab1f91e0be8e04b2be51bd42a4ff292 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 11:31:28 +0100 Subject: [PATCH 04/20] fix: docker compose --- test/docker-compose.yml | 46 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index a2544048e..8a23b3352 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -1,32 +1,26 @@ version: '3' services: 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 + <<: *test-service 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: .. - env_file: .env + <<: *test-service environment: - CODECEPT_ARGS=-c codecept.WebDriver.js --grep @WebDriverIO --debug depends_on: @@ -39,8 +33,7 @@ services: - node_modules:/node_modules test-acceptance.puppeteer: - build: .. - env_file: .env + <<: *test-service environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer depends_on: @@ -53,8 +46,7 @@ services: - node_modules:/node_modules test-bdd.faker: - build: .. - env_file: .env + <<: *test-service environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: @@ -78,29 +70,21 @@ 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: .. + <<: *test-service 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: From 984201b990de78b333eb807e9c3ac59eae15fa69 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 11:39:13 +0100 Subject: [PATCH 05/20] fix: docker compose --- test/docker-compose.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 8a23b3352..a0b301807 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -13,12 +13,6 @@ services: depends_on: - json_server - test-graphql: - <<: *test-service - command: test/graphql - depends_on: - - json_server-graphql - test-acceptance.webdriverio: <<: *test-service environment: @@ -76,13 +70,6 @@ services: expose: - 8010 - json_server-graphql: - <<: *test-service - entrypoint: [] - command: npm run json-server:graphql - expose: - - 8020 - puppeteer-image: image: ghcr.io/puppeteer/puppeteer:22.4.1 From ae2fcaec89c8c52a5822749b7a8ddefab37dfff6 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 11:51:03 +0100 Subject: [PATCH 06/20] fix: docker compose --- .github/workflows/acceptance-tests.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index c9798d47f..b400b3923 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -28,3 +28,20 @@ jobs: - uses: isbang/compose-action@v1.5.1 with: compose-file: "./test/docker-compose.yml" + down-flags: "--volumes" + - 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-acceptance.webdriverio + working_directory: test + when: always + - run: + command: docker-compose run --rm test-bdd.faker + working_directory: test + when: always From 512c5e741bdb670e879d29879091e498fa64a3c9 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 11:56:34 +0100 Subject: [PATCH 07/20] fix: docker compose --- .github/workflows/acceptance-tests.yml | 53 ++++++++++++++------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index b400b3923..1aec70f12 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -3,7 +3,7 @@ name: Acceptance Tests using docker compose on: push: branches: - - 3.x + - '3.x' pull_request: branches: - '**' @@ -16,32 +16,37 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: node-version: [20.x] steps: - # need checkout before using compose-action - - uses: actions/checkout@v3 - - uses: isbang/compose-action@v1.5.1 - with: - compose-file: "./test/docker-compose.yml" - down-flags: "--volumes" - - 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-acceptance.webdriverio - working_directory: test - when: always - - run: - command: docker-compose run --rm test-bdd.faker - working_directory: test - when: always + # 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 + continue-on-error: true + + # Run rest tests using docker-compose + - name: Run REST Tests + run: docker-compose run --rm test-rest + working-directory: test + continue-on-error: true + + # Run WebDriverIO acceptance tests using docker-compose + - name: Run WebDriverIO Acceptance Tests + run: docker-compose run --rm test-acceptance.webdriverio + working-directory: test + continue-on-error: true + + # Run faker BDD tests using docker-compose + - name: Run Faker BDD Tests + run: docker-compose run --rm test-bdd.faker + working-directory: test + continue-on-error: true From 66b3ed72909fd2258b68795592c815cae8e246ab Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 12:14:29 +0100 Subject: [PATCH 08/20] fix: docker compose --- test/docker-compose.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index a0b301807..ccab37e0f 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -14,7 +14,11 @@ services: - json_server test-acceptance.webdriverio: - <<: *test-service + build: .. + entrypoint: /codecept/node_modules/.bin/mocha + working_dir: /codecept + env_file: .env + command: test/acceptance.webdriverio environment: - CODECEPT_ARGS=-c codecept.WebDriver.js --grep @WebDriverIO --debug depends_on: @@ -24,10 +28,15 @@ services: - ./acceptance:/tests - ./data:/data - ./support:/support - - node_modules:/node_modules + - ..:/codecept + - node_modules:/codecept/node_modules test-acceptance.puppeteer: - <<: *test-service + build: .. + entrypoint: /codecept/node_modules/.bin/mocha + working_dir: /codecept + env_file: .env + command: test/acceptance.puppeteer environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer depends_on: @@ -37,17 +46,23 @@ services: - ./acceptance:/tests - ./data:/data - ./support:/support - - node_modules:/node_modules + - ..:/codecept + - node_modules:/codecept/node_modules test-bdd.faker: - <<: *test-service + build: .. + entrypoint: /codecept/node_modules/.bin/mocha + working_dir: /codecept + env_file: .env + command: test/bdd.faker environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: - ./bdd:/tests - ./data:/data - ./support:/support - - node_modules:/node_modules + - ..:/codecept + - node_modules:/codecept/node_modules selenium.chrome: image: selenium/standalone-chrome:3.141.59-oxygen From 9b437aa0847d18ccb39d5dccfb71c806dffe48b9 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 13:06:44 +0100 Subject: [PATCH 09/20] fix: docker compose --- test/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index ccab37e0f..9f5e8cc16 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -18,7 +18,7 @@ services: entrypoint: /codecept/node_modules/.bin/mocha working_dir: /codecept env_file: .env - command: test/acceptance.webdriverio + command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.WebDriver.js --grep @WebDriverIO --debug depends_on: @@ -36,7 +36,7 @@ services: entrypoint: /codecept/node_modules/.bin/mocha working_dir: /codecept env_file: .env - command: test/acceptance.puppeteer + command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer depends_on: @@ -54,7 +54,7 @@ services: entrypoint: /codecept/node_modules/.bin/mocha working_dir: /codecept env_file: .env - command: test/bdd.faker + command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: From 5e7d8ad4cdbe7569a06ee31179991f8cb14c5ddb Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 13:17:08 +0100 Subject: [PATCH 10/20] fix: docker compose --- test/docker-compose.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 9f5e8cc16..fa6560df7 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -25,9 +25,6 @@ services: - php - selenium.chrome volumes: - - ./acceptance:/tests - - ./data:/data - - ./support:/support - ..:/codecept - node_modules:/codecept/node_modules @@ -43,9 +40,6 @@ services: - php - puppeteer-image volumes: - - ./acceptance:/tests - - ./data:/data - - ./support:/support - ..:/codecept - node_modules:/codecept/node_modules @@ -58,9 +52,6 @@ services: environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: - - ./bdd:/tests - - ./data:/data - - ./support:/support - ..:/codecept - node_modules:/codecept/node_modules From c100f6dbbff42563705e83f7e8273b1cf382792a Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 13:17:57 +0100 Subject: [PATCH 11/20] fix: docker compose --- test/acceptance/coverage_test.js | 2 -- 1 file changed, 2 deletions(-) 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/'); From cc11586745b6a0899c598c2699ca6494c6883be0 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 13:26:34 +0100 Subject: [PATCH 12/20] fix: docker compose --- test/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index fa6560df7..6738d23a3 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -15,7 +15,7 @@ services: test-acceptance.webdriverio: build: .. - entrypoint: /codecept/node_modules/.bin/mocha + entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env command: test/acceptance @@ -30,7 +30,7 @@ services: test-acceptance.puppeteer: build: .. - entrypoint: /codecept/node_modules/.bin/mocha + entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env command: test/acceptance @@ -45,7 +45,7 @@ services: test-bdd.faker: build: .. - entrypoint: /codecept/node_modules/.bin/mocha + entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env command: test/acceptance From d917ce14d33ce973ac48431234a8e993c3585d4c Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 13:35:13 +0100 Subject: [PATCH 13/20] fix: docker compose --- test/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 6738d23a3..1b266133c 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -18,7 +18,6 @@ services: entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env - command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.WebDriver.js --grep @WebDriverIO --debug depends_on: @@ -33,7 +32,6 @@ services: entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env - command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer depends_on: @@ -48,7 +46,6 @@ services: entrypoint: /codecept/node_modules/.bin/codeceptjs working_dir: /codecept env_file: .env - command: test/acceptance environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: From 7986dc7411f10034d8a04b05dd94aac705ecc9fa Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 14:34:04 +0100 Subject: [PATCH 14/20] fix: docker compose --- test/docker-compose.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 1b266133c..49a78e9ef 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -15,8 +15,6 @@ services: test-acceptance.webdriverio: build: .. - entrypoint: /codecept/node_modules/.bin/codeceptjs - working_dir: /codecept env_file: .env environment: - CODECEPT_ARGS=-c codecept.WebDriver.js --grep @WebDriverIO --debug @@ -25,12 +23,14 @@ services: - selenium.chrome volumes: - ..:/codecept - - node_modules:/codecept/node_modules + - ../test/acceptance:/tests + - ../test/support:/tests + - ./data:/data + - ./support:/support + - node_modules:/node_modules test-acceptance.puppeteer: build: .. - entrypoint: /codecept/node_modules/.bin/codeceptjs - working_dir: /codecept env_file: .env environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer @@ -39,18 +39,24 @@ services: - puppeteer-image volumes: - ..:/codecept - - node_modules:/codecept/node_modules + - ../test/acceptance:/tests + - ../test/support:/tests + - ./data:/data + - ./support:/support + - node_modules:/node_modules test-bdd.faker: build: .. - entrypoint: /codecept/node_modules/.bin/codeceptjs - working_dir: /codecept env_file: .env environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: - ..:/codecept - - node_modules:/codecept/node_modules + - ../test/acceptance:/tests + - ../test/support:/tests + - ./data:/data + - ./support:/support + - node_modules:/node_modules selenium.chrome: image: selenium/standalone-chrome:3.141.59-oxygen From dfd38ae4c234dfa5b6363594e67dd369d48b8342 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 14:38:32 +0100 Subject: [PATCH 15/20] fix: docker compose --- test/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 49a78e9ef..c33974b4e 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -24,7 +24,6 @@ services: volumes: - ..:/codecept - ../test/acceptance:/tests - - ../test/support:/tests - ./data:/data - ./support:/support - node_modules:/node_modules @@ -40,7 +39,6 @@ services: volumes: - ..:/codecept - ../test/acceptance:/tests - - ../test/support:/tests - ./data:/data - ./support:/support - node_modules:/node_modules From 1fef6ab284504cb1201b00a9efd44513b06fa27f Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 14:39:22 +0100 Subject: [PATCH 16/20] fix: docker compose --- .github/workflows/acceptance-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 1aec70f12..ac4c23589 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -31,22 +31,18 @@ jobs: - name: Run Puppeteer Acceptance Tests run: docker-compose run --rm test-acceptance.puppeteer working-directory: test - continue-on-error: true # Run rest tests using docker-compose - name: Run REST Tests run: docker-compose run --rm test-rest working-directory: test - continue-on-error: true # Run WebDriverIO acceptance tests using docker-compose - name: Run WebDriverIO Acceptance Tests run: docker-compose run --rm test-acceptance.webdriverio working-directory: test - continue-on-error: true # Run faker BDD tests using docker-compose - name: Run Faker BDD Tests run: docker-compose run --rm test-bdd.faker working-directory: test - continue-on-error: true From b31780767c90871d464415472640cfaac8a8cbee Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 14:41:47 +0100 Subject: [PATCH 17/20] fix: docker compose --- test/docker-compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index c33974b4e..b309ee3e1 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -23,7 +23,7 @@ services: - selenium.chrome volumes: - ..:/codecept - - ../test/acceptance:/tests + - ./acceptance:/tests - ./data:/data - ./support:/support - node_modules:/node_modules @@ -38,7 +38,7 @@ services: - puppeteer-image volumes: - ..:/codecept - - ../test/acceptance:/tests + - ./acceptance:/tests - ./data:/data - ./support:/support - node_modules:/node_modules @@ -50,8 +50,7 @@ services: - CODECEPT_ARGS=-c codecept.faker.js volumes: - ..:/codecept - - ../test/acceptance:/tests - - ../test/support:/tests + - ./acceptance:/tests - ./data:/data - ./support:/support - node_modules:/node_modules From cc212f5fb9c2c26ebca3dd4664ea75ef26d23e5e Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 14:50:34 +0100 Subject: [PATCH 18/20] fix: docker compose --- test/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index b309ee3e1..070286f1e 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -22,7 +22,6 @@ services: - php - selenium.chrome volumes: - - ..:/codecept - ./acceptance:/tests - ./data:/data - ./support:/support @@ -37,7 +36,6 @@ services: - php - puppeteer-image volumes: - - ..:/codecept - ./acceptance:/tests - ./data:/data - ./support:/support @@ -49,7 +47,6 @@ services: environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: - - ..:/codecept - ./acceptance:/tests - ./data:/data - ./support:/support From 0e0f8518675220bf24bed1b53b4b339bfd2aec52 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 15:01:20 +0100 Subject: [PATCH 19/20] fix: docker compose --- test/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 070286f1e..a52ae4381 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -47,7 +47,7 @@ services: environment: - CODECEPT_ARGS=-c codecept.faker.js volumes: - - ./acceptance:/tests + - ./bdd:/tests - ./data:/data - ./support:/support - node_modules:/node_modules From a23daf8950e698509968f99690118b67e977d1a2 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 15 Mar 2024 15:02:08 +0100 Subject: [PATCH 20/20] fix: docker compose --- .circleci/build.sh | 5 ----- .circleci/config.yml | 48 -------------------------------------------- .circleci/test.sh | 10 --------- 3 files changed, 63 deletions(-) delete mode 100755 .circleci/build.sh delete mode 100644 .circleci/config.yml delete mode 100755 .circleci/test.sh 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