GH Actions: Cypress test on Windows Edge and Mac WebKit

cylc · Jan 20, 2025 · c3df209 · c3df209
1 parent 4ae0784
commit c3df209
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,10 +67,11 @@ jobs:
       matrix:
         browser: [firefox, chrome, electron]
         os: [ubuntu-latest]
-# TODO: re-enable once macos build is stable #590
-#         include:
-#           - os: macos-latest
-#             browser: edge
+        include:
+          - os: macos-latest
+            browser: webkit
+          - os: windows-latest
+            browser: edge
     env:
       COVERAGE: true
     steps:
@@ -83,6 +84,10 @@ jobs:
           node-version: 'lts/*'
           cache: yarn
 
+      - name: Install WebKit support
+        if: matrix.browser == 'webkit'
+        run: yarn add playwright-webkit --dev --mode=update-lockfile
+
       - name: Test (E2E)
         uses: cypress-io/github-action@v6
         env:
@@ -95,10 +100,14 @@ jobs:
           browser: ${{ matrix.browser }}
 
       - name: Test (component)
+      # Component tests on webkit hang for some reason
+        if: matrix.type == 'component' && matrix.browser != 'webkit'
         uses: cypress-io/github-action@v6
         with:
           component: true
           browser: ${{ matrix.browser }}
+          # already installed in E2E step
+          install: false
 
       - name: Upload screenshots
         uses: actions/upload-artifact@v4

diff --git a/cypress.config.cjs b/cypress.config.cjs
@@ -60,4 +60,5 @@ module.exports = defineConfig({
   },
 
   morgan: false, // Disable XHR logging as it's very noisy
+  experimentalWebKitSupport: true,
 })
diff --git a/tests/e2e/specs/userprofile.cy.js b/tests/e2e/specs/userprofile.cy.js
@@ -144,7 +144,7 @@ describe('User Profile', () => {
         .get('.node-data-cycle')
         .then(($els) => {
           expect(
-            Array.from($els, (el) => el.innerText)
+            Array.from($els, (el) => el.innerText.trim())
           ).to.deep.equal(expected)
         })
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,4 +60,5 @@ module.exports = defineConfig({ @@
       },
       morgan: false, // Disable XHR logging as it's very noisy
+      experimentalWebKitSupport: true,
     })