test server command

CarletonComputerScienceSociety · Sep 24, 2023 · d5fc804 · d5fc804
1 parent 4f9edc9
commit d5fc804
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/test-frontend.yaml b/.github/workflows/test-frontend.yaml
@@ -12,11 +12,6 @@ jobs:
         run: |
           cd client
           npm install
-          # This is janky but whatever
-          echo "cd ../service && npm run dev" >> server.sh
-          chmod +x server.sh
-          stat server.sh
-          pwd
 
       - name: Install server
         run: |
@@ -29,10 +24,11 @@ jobs:
         with:
           working-directory: client
           wait-on: 'http://localhost:5173, http://localhost:5000'
-          wait-on-timeout: 120
+          wait-on-timeout: 30
           browser: chrome
           start: |
             npm run dev
+            npm run server
 
       # after the test run completes store videos and any screenshots
       - uses: actions/upload-artifact@v3

diff --git a/client/package.json b/client/package.json
@@ -10,7 +10,8 @@
     "preview": "vite preview",
     "check": "prettier --check '**/*.{css,scss,html,ts,tsx}'",
     "format": "prettier --write '**/*.{css,scss,html,ts,tsx}'",
-    "cypress:open": "cypress open"
+    "cypress:open": "cypress open",
+    "server": "cd ../service && npm run dev"
   },
   "dependencies": {
     "localforage": "^1.10.0",