fixup! ci: upgrade to Sauce Connect 5 to fix SC4 deprecation

Author: alan-agius4

.github/workflows/ci.yml

@@ -222,7 +222,7 @@ jobs:
         with:
           username: ${{ vars.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-          region: us-west
+          region: us-west-1
           tunnelName: ${{ env.SAUCE_TUNNEL_IDENTIFIER }}
       - name: Run E2E Browser tests
         env:

.github/workflows/pr.yml

@@ -235,7 +235,7 @@ jobs:
         with:
           username: ${{ vars.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-          region: us-west
+          region: us-west-1
           tunnelName: ${{ env.SAUCE_TUNNEL_IDENTIFIER }}
       - name: Run E2E Browser tests
         env:

tests/e2e/assets/protractor-saucelabs.conf.js

@@ -7,6 +7,49 @@ const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
 
 const tunnelIdentifier = process.env['SAUCE_TUNNEL_IDENTIFIER'];
 
+const capabilities = [
+  {
+    browserName: 'chrome',
+    version: '132',
+    platform: 'Windows 11',
+  },
+  {
+    browserName: 'chrome',
+    version: '131',
+    platform: 'Windows 11',
+  },
+  {
+    browserName: 'firefox',
+    version: '134',
+    platform: 'Windows 11',
+  },
+  {
+    browserName: 'firefox',
+    version: '128', // Latest Firefox ESR version as of Jan 2025
+    platform: 'Windows 11',
+  },
+  {
+    browserName: 'safari',
+    platform: 'macOS 13',
+    version: '17',
+  },
+  {
+    browserName: 'safari',
+    platform: 'macOS 12',
+    version: '16',
+  },
+  {
+    browserName: 'MicrosoftEdge',
+    platform: 'Windows 11',
+    version: '132',
+  },
+  {
+    browserName: 'MicrosoftEdge',
+    platform: 'Windows 11',
+    version: '131',
+  },
+];
+
 /**
  * @type { import("protractor").Config }
  */
@@ -19,96 +62,21 @@ exports.config = {
   specs: ['./src/**/*.e2e-spec.ts'],
 
   // NOTE: https://saucelabs.com/products/platform-configurator can be used to determine configuration values
-  multiCapabilities: [
-    {
-      browserName: 'chrome',
-      version: '132',
-      platform: 'Windows 11',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'chrome',
-      version: '131',
-      platform: 'Windows 11',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'firefox',
-      version: '134',
-      platform: 'Windows 11',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
+  multiCapabilities: capabilities.map((caps) => {
+    if (tunnelIdentifier) {
+      return {
+        ...caps,
         tunnelIdentifier,
         tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'firefox',
-      version: '128', // Latest Firefox ESR version as of Jan 2025
-      platform: 'Windows 11',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'safari',
-      platform: 'macOS 13',
-      version: '17',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'safari',
-      platform: 'macOS 12',
-      version: '16',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'MicrosoftEdge',
-      platform: 'Windows 11',
-      version: '132',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-    {
-      browserName: 'MicrosoftEdge',
-      platform: 'Windows 11',
-      version: '131',
-      tunnelIdentifier,
-      tunnelName: tunnelIdentifier,
-      'sauce:options': {
-        tunnelIdentifier,
-        tunnelName: tunnelIdentifier,
-      },
-    },
-  ],
+        'sauce:options': {
+          tunnelIdentifier,
+          tunnelName: tunnelIdentifier,
+        },
+      };
+    }
+
+    return caps;
+  }),
 
   // Only allow one session at a time to prevent over saturation of Saucelabs sessions.
   maxSessions: 1,