Merge pull request #7961 from jrjohnson/browser-testing

Improve Browserstack Testing
ilios · Jul 12, 2024 · 794afa5 · 794afa5
2 parents 6e1b0a2 + 470b7d2
commit 794afa5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,7 @@ jobs:
     name: ${{matrix.workspace}} Test (${{ matrix.node-version }})
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    needs: [lint]
 
     strategy:
       fail-fast: false
@@ -92,22 +93,19 @@ jobs:
         run: pnpm run --filter ${{matrix.workspace}} build
 
   browserstack-test:
-    name: Browserstack ${{matrix.workspace}} ${{ matrix.launcher }}
+    name: Browser Stack Test
     runs-on: ubuntu-latest
     timeout-minutes: 120
     needs: [test]
     strategy:
       fail-fast: false
-      max-parallel: 2
+      max-parallel: 1
       matrix:
         workspace:
           - frontend
           - test-app
-          - lti-course-manager
-          - lti-dashboard
         launcher:
           - BS_OSX_Safari
-          - BS_MS_Edge
           - BS_IOS_SAFARI
           - BS_CHROME_ANDROID
     steps:
@@ -120,15 +118,15 @@ jobs:
           node-version: 20
           cache: pnpm
       - run: pnpm install
-      - name: test:browserstack ${{ matrix.launcher }}
+      - name: test:browserstack ${{matrix.workspace}} ${{ matrix.launcher }}
         env:
           BROWSERSTACK_USERNAME: iliosgithub_1UGowwsqE
           # This is in plaintext on purpose. It has no privileged access to anything (this is a free
           # account) and it allows us to run browserstack tests against PRs.
           BROWSERSTACK_ACCESS_KEY: yJjw6sE6izkpUw9oasGT
           # The following is necessary when using browserstack under matrix builds on Github Actions
           # The Job ID + Run ID isn't unique across matrix runs and will fail when run simultaneously
-          BROWSERSTACK_LOCAL_ID_SUFFIX: ${{ matrix.launcher }}
+          BROWSERSTACK_LOCAL_ID_SUFFIX: ${{matrix.workspace}}-${{ matrix.launcher }}
         run: |
           pnpm --filter ${{matrix.workspace}} exec ember browserstack:connect
           pnpm --filter ${{matrix.workspace}} exec ember test --test-port=7774 --host=127.0.0.1 --config-file=testem.browserstack.js --launch=${{ matrix.launcher }}

diff --git a/packages/frontend/testem.browserstack.js b/packages/frontend/testem.browserstack.js
@@ -17,11 +17,6 @@ const BrowserStackLaunchers = {
     ],
     protocol: 'browser',
   },
-  BS_MS_Edge: {
-    exe: 'node_modules/.bin/browserstack-launch',
-    args: ['--os', 'Windows', '--osv', '11', '--b', 'edge', '--bv', '115', ...defaultArgs],
-    protocol: 'browser',
-  },
   BS_IOS_SAFARI: {
     exe: 'node_modules/.bin/browserstack-launch',
     args: [
@@ -64,7 +59,7 @@ module.exports = {
   reporter: FailureOnlyPerBrowserReporter,
   browser_start_timeout: 2000,
   browser_disconnect_timeout: 120,
-  parallel: 4,
+  parallel: 1,
   disable_watching: true,
   launchers: BrowserStackLaunchers,
   launch_in_dev: [],

diff --git a/packages/lti-course-manager/testem.browserstack.js b/packages/lti-course-manager/testem.browserstack.js
@@ -17,11 +17,6 @@ const BrowserStackLaunchers = {
     ],
     protocol: 'browser',
   },
-  BS_MS_Edge: {
-    exe: 'node_modules/.bin/browserstack-launch',
-    args: ['--os', 'Windows', '--osv', '11', '--b', 'edge', '--bv', '115', ...defaultArgs],
-    protocol: 'browser',
-  },
   BS_IOS_SAFARI: {
     exe: 'node_modules/.bin/browserstack-launch',
     args: [
@@ -64,7 +59,7 @@ module.exports = {
   reporter: FailureOnlyPerBrowserReporter,
   browser_start_timeout: 2000,
   browser_disconnect_timeout: 120,
-  parallel: 4,
+  parallel: 1,
   disable_watching: true,
   launchers: BrowserStackLaunchers,
   launch_in_dev: [],

diff --git a/packages/lti-dashboard/testem.browserstack.js b/packages/lti-dashboard/testem.browserstack.js
@@ -17,11 +17,6 @@ const BrowserStackLaunchers = {
     ],
     protocol: 'browser',
   },
-  BS_MS_Edge: {
-    exe: 'node_modules/.bin/browserstack-launch',
-    args: ['--os', 'Windows', '--osv', '11', '--b', 'edge', '--bv', '115', ...defaultArgs],
-    protocol: 'browser',
-  },
   BS_IOS_SAFARI: {
     exe: 'node_modules/.bin/browserstack-launch',
     args: [
@@ -64,7 +59,7 @@ module.exports = {
   reporter: FailureOnlyPerBrowserReporter,
   browser_start_timeout: 2000,
   browser_disconnect_timeout: 120,
-  parallel: 4,
+  parallel: 1,
   disable_watching: true,
   launchers: BrowserStackLaunchers,
   launch_in_dev: [],

diff --git a/packages/test-app/testem.browserstack.js b/packages/test-app/testem.browserstack.js
@@ -17,11 +17,6 @@ const BrowserStackLaunchers = {
     ],
     protocol: 'browser',
   },
-  BS_MS_Edge: {
-    exe: 'node_modules/.bin/browserstack-launch',
-    args: ['--os', 'Windows', '--osv', '11', '--b', 'edge', '--bv', '115', ...defaultArgs],
-    protocol: 'browser',
-  },
   BS_IOS_SAFARI: {
     exe: 'node_modules/.bin/browserstack-launch',
     args: [
@@ -64,7 +59,7 @@ module.exports = {
   reporter: FailureOnlyPerBrowserReporter,
   browser_start_timeout: 2000,
   browser_disconnect_timeout: 120,
-  parallel: 4,
+  parallel: 1,
   disable_watching: true,
   launchers: BrowserStackLaunchers,
   launch_in_dev: [],