From 64696c3503a6f563ea138209580ad1cf55bcbc4e Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Thu, 18 Apr 2024 16:37:33 +0200 Subject: [PATCH 1/7] fix: get ppt version in package.json --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 445b740c8..e1166bf3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ RUN apt-get update && \ apt-get install -y libgtk2.0-0 libgconf-2-4 \ libasound2 libxtst6 libxss1 libnss3 xvfb +# Install jq +RUN apt-get update && apt-get install -y jq + # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others) # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer # installs, work. @@ -35,7 +38,7 @@ RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs RUN mkdir /tests WORKDIR /tests # Install puppeteer so it's available in the container. -RUN npm i puppeteer@$(npm view puppeteer version) && npx puppeteer browsers install chrome +RUN npm i puppeteer@$(jq .devDependencies.puppeteer package.json -r) && npx puppeteer browsers install chrome RUN google-chrome --version # Install playwright browsers From 1b8a281240554e34f929e14bba2a6153d7750017 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Thu, 18 Apr 2024 16:52:54 +0200 Subject: [PATCH 2/7] fix: get ppt version in package.json --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1166bf3d..3f1a28c6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,13 +34,14 @@ COPY . /codecept RUN chown -R pptruser:pptruser /codecept RUN runuser -l pptruser -c 'npm i --force --loglevel=warn --prefix /codecept' -RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs -RUN mkdir /tests -WORKDIR /tests # Install puppeteer so it's available in the container. RUN npm i puppeteer@$(jq .devDependencies.puppeteer package.json -r) && npx puppeteer browsers install chrome RUN google-chrome --version +RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs +RUN mkdir /tests +WORKDIR /tests + # Install playwright browsers RUN npx playwright install From 5aa3ee192d5d3eaeca4165ae429a3981946c4481 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Thu, 18 Apr 2024 17:11:01 +0200 Subject: [PATCH 3/7] fix: get ppt version in package.json --- .github/workflows/acceptance-tests.yml | 8 +++++++- Dockerfile | 3 ++- test/docker-compose.yml | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index ac4c23589..7451466b9 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -27,9 +27,15 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 + - name: Extract ppt version from package.json + uses: sergeysova/jq-action@v2 + id: version + with: + cmd: 'jq .devDependencies.puppeteer package.json -r' + # Run acceptance tests using docker-compose - name: Run Puppeteer Acceptance Tests - run: docker-compose run --rm test-acceptance.puppeteer + run: 'PPT_VERSION=${{ steps.version.outputs.value }}" docker-compose run --rm test-acceptance.puppeteer' working-directory: test # Run rest tests using docker-compose diff --git a/Dockerfile b/Dockerfile index 3f1a28c6c..71b3a56fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN chown -R pptruser:pptruser /codecept RUN runuser -l pptruser -c 'npm i --force --loglevel=warn --prefix /codecept' # Install puppeteer so it's available in the container. -RUN npm i puppeteer@$(jq .devDependencies.puppeteer package.json -r) && npx puppeteer browsers install chrome +RUN npm i puppeteer@$(echo $PPT_VERSION) && npx puppeteer browsers install chrome RUN google-chrome --version RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs @@ -49,6 +49,7 @@ RUN npx playwright install ENV CODECEPT_ARGS="" ENV RUN_MULTIPLE=false ENV NO_OF_WORKERS="" +ENV PPT_VERSION=$PPT_VERSION # Set HOST ENV variable for Selenium Server ENV HOST=selenium diff --git a/test/docker-compose.yml b/test/docker-compose.yml index a52ae4381..98cca4a83 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -32,6 +32,7 @@ services: env_file: .env environment: - CODECEPT_ARGS=-c codecept.Puppeteer.js --grep @Puppeteer + - PPT_VERSION=$PPT_VERSION depends_on: - php - puppeteer-image From 7b95e1b8f27f3225f7e27a836a9f69d620d2e93b Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Thu, 18 Apr 2024 17:12:27 +0200 Subject: [PATCH 4/7] fix: get ppt version in package.json --- .github/workflows/acceptance-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 7451466b9..111a731b8 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -35,7 +35,7 @@ jobs: # Run acceptance tests using docker-compose - name: Run Puppeteer Acceptance Tests - run: 'PPT_VERSION=${{ steps.version.outputs.value }}" docker-compose run --rm test-acceptance.puppeteer' + run: 'PPT_VERSION=${{ steps.version.outputs.value }} docker-compose run --rm test-acceptance.puppeteer' working-directory: test # Run rest tests using docker-compose From a773e5bcc6cabc2a8879d1deb7d977b45a86c066 Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Thu, 18 Apr 2024 17:30:51 +0200 Subject: [PATCH 5/7] fix: get ppt version in package.json --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71b3a56fe..366d0fefe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,8 @@ RUN chown -R pptruser:pptruser /codecept RUN runuser -l pptruser -c 'npm i --force --loglevel=warn --prefix /codecept' # Install puppeteer so it's available in the container. -RUN npm i puppeteer@$(echo $PPT_VERSION) && npx puppeteer browsers install chrome +RUN echo $PPT_VERSION +RUN npm i puppeteer@$(echo $PPT_VERSION) --force && npx puppeteer browsers install chrome RUN google-chrome --version RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs From ca0529cd4ef8382ddc4bbf52cc77e9ccca754b0b Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 19 Apr 2024 09:16:13 +0200 Subject: [PATCH 6/7] disable ppt tests --- .github/workflows/acceptance-tests.yml | 11 ----------- Dockerfile | 12 +++--------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 111a731b8..122b534c3 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -27,17 +27,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Extract ppt version from package.json - uses: sergeysova/jq-action@v2 - id: version - with: - cmd: 'jq .devDependencies.puppeteer package.json -r' - - # Run acceptance tests using docker-compose - - name: Run Puppeteer Acceptance Tests - run: 'PPT_VERSION=${{ steps.version.outputs.value }} 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 diff --git a/Dockerfile b/Dockerfile index 366d0fefe..445b740c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,6 @@ RUN apt-get update && \ apt-get install -y libgtk2.0-0 libgconf-2-4 \ libasound2 libxtst6 libxss1 libnss3 xvfb -# Install jq -RUN apt-get update && apt-get install -y jq - # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others) # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer # installs, work. @@ -34,14 +31,12 @@ COPY . /codecept RUN chown -R pptruser:pptruser /codecept RUN runuser -l pptruser -c 'npm i --force --loglevel=warn --prefix /codecept' -# Install puppeteer so it's available in the container. -RUN echo $PPT_VERSION -RUN npm i puppeteer@$(echo $PPT_VERSION) --force && npx puppeteer browsers install chrome -RUN google-chrome --version - RUN ln -s /codecept/bin/codecept.js /usr/local/bin/codeceptjs RUN mkdir /tests WORKDIR /tests +# Install puppeteer so it's available in the container. +RUN npm i puppeteer@$(npm view puppeteer version) && npx puppeteer browsers install chrome +RUN google-chrome --version # Install playwright browsers RUN npx playwright install @@ -50,7 +45,6 @@ RUN npx playwright install ENV CODECEPT_ARGS="" ENV RUN_MULTIPLE=false ENV NO_OF_WORKERS="" -ENV PPT_VERSION=$PPT_VERSION # Set HOST ENV variable for Selenium Server ENV HOST=selenium From 4efca1755f2ae0d532e9e41e928193a014cff67b Mon Sep 17 00:00:00 2001 From: kobenguyent Date: Fri, 19 Apr 2024 09:20:05 +0200 Subject: [PATCH 7/7] disable ppt tests --- .circleci/test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/test.sh b/.circleci/test.sh index 07ebced15..711aa14ca 100755 --- a/.circleci/test.sh +++ b/.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