From 96032ad3611f028b0e48a7673fe9cf99af2c4690 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 14 Mar 2021 09:37:05 +0000
Subject: [PATCH] timeouts

---
 .github/workflows/collaboration.yml              | 16 +++++-----------
 .../frontend/cypress/integration/collaborate.js  |  4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/collaboration.yml b/.github/workflows/collaboration.yml
index 6c3617e47..00d849e8c 100644
--- a/.github/workflows/collaboration.yml
+++ b/.github/workflows/collaboration.yml
@@ -24,18 +24,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    - name: Cache node modules
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-node-modules
+    - uses: actions/cache@v2
+      id: cache
       with:
-        # npm cache files are stored in `~/.npm` on Linux/macOS
         path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
     - uses: actions/setup-node@v2
       with:
@@ -45,7 +38,8 @@ jobs:
       shell: msys2 {0}
       run: src/bin/installDeps.sh
 
-    - name: Install Cypress
+    - name: Install Dependencies
+      if: steps.cache.outputs.cache-hit != 'true'
       run: npm install cypress -g
 
     - name: Run Etherpad & Tests
diff --git a/src/tests/frontend/cypress/integration/collaborate.js b/src/tests/frontend/cypress/integration/collaborate.js
index ae6b48255..e4d3269c1 100644
--- a/src/tests/frontend/cypress/integration/collaborate.js
+++ b/src/tests/frontend/cypress/integration/collaborate.js
@@ -43,10 +43,10 @@ Cypress.Commands.add('iframe', {prevSubject: 'element'},
 describe(__filename, () => {
   it('Makes edits to pad', () => {
     let originalLineCount;
-    cy.visit('http://127.0.0.1:9001/p/collab', {timeout: 30000});
+    cy.visit('http://127.0.0.1:9001/p/collab', {timeout: 120000});
     // Until we find a better way, this is required.
     cy.wait(10000); // wait for Minified JS to be built...
-    cy.get('iframe[name="ace_outer"]', {timeout: 30000}).iframe()
+    cy.get('iframe[name="ace_outer"]', {timeout: 120000}).iframe()
         .find('iframe[name="ace_inner"]').iframe()
         .find('.ace-line:first')
         .should('be.visible');