Fix test runners

Actually run test, use the exec method of pnpm instead of scripts to run each test so we can see more clearly what is going on in CI, and rename tests for visibility in the output.
ilios · Feb 6, 2024 · cbc3aa7 · cbc3aa7
1 parent 0db7ba8
commit cbc3aa7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
         run: pnpm run lint
 
   test:
-    name: "Test"
+    name: ${{matrix.workspace}} Test (${{ matrix.node-version }})
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -47,7 +47,6 @@ jobs:
         workspace:
           - frontend
           - test-app
-
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v2
@@ -60,10 +59,10 @@ jobs:
       - name: Install Dependencies
         run: pnpm install
       - name: Run Tests
-        run: pnpm run --filter ${{matrix.workspace}} test:ember
+        run: pnpm --filter ${{matrix.workspace}} exec ember test
 
   build:
-    name: Build
+    name: Build (${{ matrix.node-version }})
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
@@ -84,7 +83,7 @@ jobs:
         run: pnpm run --filter frontend build
 
   browserstack-test:
-    name: Browserstack ${{ matrix.launcher }}
+    name: Browserstack ${{matrix.workspace}} ${{ matrix.launcher }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [test]
@@ -120,13 +119,13 @@ jobs:
           # The Job ID + Run ID isn't unique across matrix runs and will fail when run simultaneously
           BROWSERSTACK_LOCAL_ID_SUFFIX: ${{ matrix.launcher }}
         run: |
-          pnpm run --filter ${{matrix.workspace}} browserstack:connect
-          pnpm run --filter ${{matrix.workspace}} test:ember:browserstack --launch=${{ matrix.launcher }}
-          pnpm run --filter ${{matrix.workspace}} browserstack:disconnect
-          pnpm run --filter ${{matrix.workspace}} browserstack:results
+          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 }}
+          pnpm --filter ${{matrix.workspace}} exec ember browserstack:disconnect
+          pnpm --filter ${{matrix.workspace}} exec ember browserstack:results
 
   firefox-test:
-    name: Browser Tests (Firefox)
+    name: ${{matrix.workspace}} Firefox ${{ matrix.firefox-version }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [test]
@@ -153,7 +152,7 @@ jobs:
           firefox-version: ${{ matrix.firefox-version }}
       - run: firefox --version
       - name: test
-        run: pnpm run --filter ${{matrix.workspace}} test:ember --launch=Firefox
+        run: pnpm --filter ${{matrix.workspace}} exec ember test --launch=Firefox
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -203,7 +202,7 @@ jobs:
       - name: Install Dependencies
         run: pnpm install
       - name: Run Tests
-        run: pnpm run --filter frontend test:ember
+        run: pnpm --filter frontend exec ember test
 
   build-with-embroider:
     name: Build With Embroider

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -15,10 +15,6 @@
     "deploy:production": "ember deploy production --activate",
     "deploy:staging": "ember deploy staging --activate",
     "deploy:test": "ember deploy development",
-    "test:ember:browserstack": "ember test --test-port=7774 --host=127.0.0.1 --config-file=testem.browserstack.js",
-    "browserstack:connect": "ember browserstack:connect",
-    "browserstack:disconnect": "ember browserstack:disconnect",
-    "browserstack:results": "ember browserstack:results",
     "preinstall": "npx only-allow pnpm"
   },
   "devDependencies": {

diff --git a/packages/test-app/package.json b/packages/test-app/package.json
@@ -12,11 +12,7 @@
     "build": "ember build --environment=production",
     "start": "ember serve",
     "test:ember": "ember test",
-    "test:ember:browserstack": "ember test --test-port=7774 --host=127.0.0.1 --config-file=testem.browserstack.js",
     "test:percy": "percy exec -- pnpm run test:ember",
-    "browserstack:connect": "ember browserstack:connect",
-    "browserstack:disconnect": "ember browserstack:disconnect",
-    "browserstack:results": "ember browserstack:results",
     "tryone": "ember try:one"
   },
   "devDependencies": {