libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

aw

Browse source
This commit is contained in:
John McLear 2021-03-14 13:42:02 +00:00
parent 954810b9f2
commit ce21ac9ba4
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/collaboration.yml vendored
View file

@ -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

1
src/tests/frontend/cypress/integration/collaborate.js
View file

@ -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')