From ce21ac9ba43e91f55ca81ae7bcc5d889641f7c05 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 14 Mar 2021 13:42:02 +0000 Subject: [PATCH] aw --- .github/workflows/collaboration.yml | 10 ++++++++-- src/tests/frontend/cypress/integration/collaborate.js | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/collaboration.yml b/.github/workflows/collaboration.yml index 9627b0edc..eac9295f2 100644 --- a/.github/workflows/collaboration.yml +++ b/.github/workflows/collaboration.yml @@ -45,10 +45,10 @@ jobs: curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test cd src/tests/frontend # build first - xvfb-run -a cypress run --spec cypress/integration/test.js --config-file cypress/cypress.json --config videosFolder=cypress/videos + xvfb-run -a cypress run --spec cypress/integration/test.js --config-file cypress/cypress.json --config video=false # run collaboration tests xvfb-run -a cypress run --spec cypress/integration/collaborate.js --config-file cypress/cypress.json --config video=false & - xvfb-run -a cypress run --spec cypress/integration/collaborate.js --config-file cypress/cypress.json --config videosFolder=cypress/videos + xvfb-run -a cypress run --spec cypress/integration/collaborate.js --config-file cypress/cypress.json --config videosFolder=cypress/videos videoCompression=0 screenshotsFolder=cypress/screenshots - name: Sleep for 30 seconds for videos to encode uses: whatnick/wait-action@master @@ -60,3 +60,9 @@ jobs: with: name: cypress-videos path: src/tests/frontend/cypress/videos/ + + - uses: actions/upload-artifact@v2 + if: always() + with: + name: cypress-screenshots + path: src/tests/frontend/cypress/screenshots diff --git a/src/tests/frontend/cypress/integration/collaborate.js b/src/tests/frontend/cypress/integration/collaborate.js index 08c1387ed..e375f6bf5 100644 --- a/src/tests/frontend/cypress/integration/collaborate.js +++ b/src/tests/frontend/cypress/integration/collaborate.js @@ -45,7 +45,6 @@ describe(__filename, () => { let originalLineCount; cy.visit('http://127.0.0.1:9001/p/collab', {timeout: 120000}); // Until we find a better way, this is required. - cy.wait(20000); // wait for Minified JS to be built... cy.get('iframe[name="ace_outer"]', {timeout: 120000}).iframe() .find('iframe[name="ace_inner"]').iframe() .find('.ace-line:first')