Merge pull request #39 from xenosf/testing-ci

CI improvements
CS3219-AY2425S1 · Nov 7, 2024 · 076f8c9 · 076f8c9
2 parents a266c7e + a33bd7e
commit 076f8c9
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 14 deletions.
diff --git a/.github/workflows/client-test.yml → .github/workflows/test-client.yml b/.github/workflows/client-test.yml → .github/workflows/test-client.yml
@@ -35,4 +35,8 @@ jobs:
       - name: Install Client Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test
+        run: npm run ci -- --coverage
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/server-test.yml → .github/workflows/test-server.yml b/.github/workflows/server-test.yml → .github/workflows/test-server.yml
@@ -36,7 +36,11 @@ jobs:
       - name: Install Matching Service Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test
+        run: npm run ci
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   question-service:
     strategy:
       fail-fast: false
@@ -66,7 +70,11 @@ jobs:
       - name: Install Question Service Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test
+        run: npm run ci
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   user-service:
     strategy:
       fail-fast: false
@@ -97,7 +105,11 @@ jobs:
       - name: Install User Service Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test 
+        run: npm run ci
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   collaboration-service:
     strategy:
       fail-fast: false
@@ -126,7 +138,11 @@ jobs:
       - name: Install Collaboration Service Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test
+        run: npm run ci
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   ai-service:
     strategy:
       fail-fast: false
@@ -156,4 +172,8 @@ jobs:
       - name: Install AI Service Dependencies
         run: npm ci
       - name: Run Tests
-        run: npm run test
+        run: npm run ci
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/system-test.yml → .github/workflows/test-system.yml b/.github/workflows/system-test.yml → .github/workflows/test-system.yml
@@ -66,7 +66,11 @@ jobs:
             cd client
             npm ci
             npm run start &
-      - name: Run Tests
-        run: |
             sleep 60
-            xvfb-run --server-args="-screen 0 1024x768x24" npm run test
+      - name: Run Tests
+        uses: nick-fields/retry@v3
+        with:
+          timeout_seconds: 100
+          max_attempts: 5
+          retry_on: error
+          command: xvfb-run --server-args="-screen 0 1024x768x24" npm run test
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 **/.DS_Store
 server/matching-service/dump.rdb
 **/dist
+**/coverage
diff --git a/client/package.json b/client/package.json
@@ -29,6 +29,7 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
+    "ci": "react-scripts test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {

diff --git a/server/ai-service/package.json b/server/ai-service/package.json
@@ -6,7 +6,8 @@
         "test": "jest",
         "serve": "node server.js",
         "start": "node server.js",
-        "dev": "nodemon server.js"
+        "dev": "nodemon server.js",
+        "ci": "jest --ci --coverage"
     },
     "keywords": [],
     "author": "",

diff --git a/server/collaboration-service/package.json b/server/collaboration-service/package.json
@@ -6,7 +6,8 @@
         "test": "jest",
         "serve": "node server.js",
         "start": "node server.js",
-        "dev": "nodemon server.js"
+        "dev": "nodemon server.js",
+        "ci": "jest --ci --coverage"
     },
     "keywords": [],
     "author": "",

diff --git a/server/matching-service/package.json b/server/matching-service/package.json
@@ -6,7 +6,8 @@
     "test": "jest",
     "serve": "node server.js",
     "start": "node server.js",
-    "dev": "nodemon server.js"
+    "dev": "nodemon server.js",
+    "ci": "jest --ci --coverage"
   },
   "keywords": [],
   "author": "",

diff --git a/server/question-service/package.json b/server/question-service/package.json
@@ -6,7 +6,8 @@
     "test": "jest",
     "serve": "node server.js",
     "start": "node server.js",
-    "dev": "nodemon server.js"
+    "dev": "nodemon server.js",
+    "ci": "jest --ci --coverage"
   },
   "keywords": [],
   "author": "",

diff --git a/server/user-service/package.json b/server/user-service/package.json
@@ -7,7 +7,8 @@
   "scripts": {
     "dev": "nodemon server.js",
     "start": "node server.js",
-    "test": "jest"
+    "test": "jest",
+    "ci": "jest --ci --coverage"
   },
   "keywords": [],
   "author": "",