[pull] master from gchq:master

.github/actions/setup-chrome/action.yml

@@ -0,0 +1,24 @@
+name: 'Setup Chrome'
+description: 'Installs a pinned version of Chrome and links it for chromedriver'
+
+inputs:
+  chrome-version:
+    description: 'Chrome version to install'
+    required: false
+    default: '152'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup Chrome
+      shell: bash
+      run: |
+        rm -rf chrome/
+        rm -rf node_modules/chromedriver/lib/chromedriver/chrome
+        npx @puppeteer/browsers install chrome@${{ inputs.chrome-version }}
+        chromepath=$(find "$(pwd)"/chrome/* -name chrome -print -quit)
+        if [ -z "$chromepath" ]; then
+          echo "Chrome binary not found after install under $(pwd)/chrome" >&2
+          exit 1
+        fi
+        ln -s "$chromepath" node_modules/chromedriver/lib/chromedriver/chrome

.github/workflows/master.yml

@@ -53,14 +53,11 @@ jobs:
       - name: Setup Chrome
         id: setup-chrome
         if: success()
-        run: |
-          npx @puppeteer/browsers install chrome@148
-          echo chromedir=$(dirname $(find `pwd`/chrome/* -name chrome -print -quit)) >> $GITHUB_OUTPUT
+        uses: ./.github/actions/setup-chrome
 
       - name: UI Tests
         if: success()
         run: |
-          export PATH=${{ steps.setup-chrome.outputs.chromedir }}:$PATH
           sudo apt-get install xvfb
           xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
 

.github/workflows/pull_requests.yml

@@ -54,14 +54,11 @@ jobs:
       - name: Setup Chrome
         id: setup-chrome
         if: success()
-        run: |
-          npx @puppeteer/browsers install chrome@148
-          echo chromedir=$(dirname $(find `pwd`/chrome/* -name chrome -print -quit)) >> $GITHUB_OUTPUT
+        uses: ./.github/actions/setup-chrome
 
       - name: UI Tests
         if: success()
         run: |
-          export PATH=${{ steps.setup-chrome.outputs.chromedir }}:$PATH
           sudo apt-get install xvfb
           xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
 

.github/workflows/releases.yml

@@ -49,14 +49,11 @@ jobs:
       - name: Setup Chrome
         id: setup-chrome
         if: success()
-        run: |
-          npx @puppeteer/browsers install chrome@148
-          echo chromedir=$(dirname $(find `pwd`/chrome/* -name chrome -print -quit)) >> $GITHUB_OUTPUT
+        uses: ./.github/actions/setup-chrome
 
       - name: UI Tests
         if: success()
         run: |
-          export PATH=${{ steps.setup-chrome.outputs.chromedir }}:$PATH
           sudo apt-get install xvfb
           xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
 

nightwatch.json

@@ -14,7 +14,10 @@
         "log_path": "tests/browser/output"
       },
       "desiredCapabilities": {
-        "browserName": "chrome"
+        "browserName": "chrome",
+        "chromeOptions": {
+              "args" : ["--no-sandbox"]
+        }
       },
       "enable_fail_fast": true
     },

package.json

@@ -53,7 +53,7 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "base64-loader": "^1.0.0",
-    "chromedriver": "^150.0.4",
+    "chromedriver": "152.0.2",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
     "compression-webpack-plugin": "^12.0.0",
@@ -198,7 +198,7 @@
   },
   "allowScripts": {
     "@nightwatch/nightwatch-inspector@1.0.1": true,
-    "chromedriver@150.0.4": true,
+    "chromedriver@152.0.2": true,
     "core-js": false,
     "core-js-pure": false,
     "fsevents": false,