From 74909a2c7e2b1de825acd3cb68e7d738eaa5045d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 29 Jan 2021 14:57:29 +0000
Subject: [PATCH] use 3 tests instead of 4..

---
 .github/workflows/frontend-tests.yml | 77 ++++------------------------
 1 file changed, 9 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index a1fbf2ddd..b3df49c57 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -3,7 +3,7 @@ name: "Frontend tests"
 on: [push]
 
 jobs:
-  withoutpluginsAndWithoutMinification:
+  withoutpluginsAndWithoutMinificationAndMaxAge0:
     name: without plugins and without minification
     runs-on: ubuntu-latest
 
@@ -19,6 +19,9 @@ jobs:
         TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
       run: tests/frontend/travis/sauce_tunnel.sh
 
+    - name: Install ep_preformance_test_hook
+      run: ep_performance_test_hooks
+
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: bin/installDeps.sh
 
@@ -32,73 +35,8 @@ jobs:
     - name: Set minify to false
       run: "sed -i 's/\"minify\": \"true\",/\"minify\": \"false\",/' settings.json"
 
-    - name: Run the frontend tests
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-        GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-      run: |
-        tests/frontend/travis/runner.sh
-
-  withpluginsAndWithoutMinification:
-    name: with plugins and without minification
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Run sauce-connect-action
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
-      run: tests/frontend/travis/sauce_tunnel.sh
-
-    - name: Install Etherpad plugins
-      run: >
-        npm install
-        ep_align
-        ep_author_hover
-        ep_cursortrace
-        ep_font_size
-        ep_hash_auth
-        ep_headings2
-        ep_markdown
-        ep_readonly_guest
-        ep_set_title_on_pad
-        ep_spellcheck
-        ep_subscript_and_superscript
-        ep_table_of_contents
-        ep_performance_test_hooks
-
-    # This must be run after installing the plugins, otherwise npm will try to
-    # hoist common dependencies by removing them from src/node_modules and
-    # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
-    # logic appears to be buggy, because it sometimes removes dependencies from
-    # src/node_modules but fails to add them to the top-level node_modules. Even
-    # if npm correctly hoists the dependencies, the hoisting seems to confuse
-    # tools such as `npm outdated`, `npm update`, and some ESLint rules.
-    - name: Install all dependencies and symlink for ep_etherpad-lite
-      run: bin/installDeps.sh
-
-    - name: export GIT_HASH to env
-      id: environment
-      run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-
-    - name: Write custom settings.json with loglevel WARN
-      run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
-
-    - name: Set minify to false
-      run: "sed -i 's/\"minify\": \"true\",/\"minify\": \"false\",/' settings.json"
-
-
-      # XXX we should probably run all tests, because plugins could effect their results
-    - name: Remove standard frontend test files, so only plugin tests are run
-      run: rm tests/frontend/specs/*
+    - name: Set maxAge to 0
+      run: "sed -i 's/\"maxAge\": \"21600\",/\"maxAge\": \"0\",/' settings.json"
 
     - name: Run the frontend tests
       shell: bash
@@ -126,6 +64,9 @@ jobs:
         TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
       run: tests/frontend/travis/sauce_tunnel.sh
 
+    - name: Install ep_preformance_test_hook
+      run: ep_performance_test_hooks
+
     - name: Install all dependencies and symlink for ep_etherpad-lite
       run: bin/installDeps.sh