Merge branch 'main' of https://github.com/UTSC-CSCC01-Software-Engineering-I/c01s25-project-microsofties

Author: Adrit-3001

.github/workflows/docker-build-push.yml

@@ -2,16 +2,86 @@ name: Build and Push Docker Images
 
 on:
   push:
-    branches: [ main, master ]  # Adjust branch names as needed
+    branches: [ main, master ]
   pull_request:
     branches: [ main, master ]
 
 env:
   DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
 
 jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+        cache: 'npm'
+        cache-dependency-path: backend/package-lock.json
+
+    - name: Install backend dependencies
+      run: |
+        cd backend
+        npm ci
+
+    - name: Run backend tests
+      run: |
+        cd backend
+        npm test
+      env:
+        NODE_ENV: test
+        JWT_SECRET: test_jwt_secret
+        MONGODB_URI: mongodb://localhost:27017/glow_test
+
+    - name: Upload backend test results
+      uses: actions/upload-artifact@v4  # Changed from v3 to v4
+      if: always()
+      with:
+        name: backend-test-results
+        path: backend/coverage/
+
+  test-frontend:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+        cache: 'npm'
+        cache-dependency-path: frontend/package-lock.json
+
+    - name: Install frontend dependencies
+      run: |
+        cd frontend
+        npm ci
+
+    - name: Run frontend tests
+      run: |
+        cd frontend
+        npm test -- --coverage --watchAll=false
+      env:
+        NEXT_PUBLIC_API_URL: http://localhost:5000/api
+        CI: true
+
+    - name: Upload frontend test results
+      uses: actions/upload-artifact@v4  # Changed from v3 to v4
+      if: always()
+      with:
+        name: frontend-test-results
+        path: frontend/coverage/
+
   build-backend:
     runs-on: ubuntu-latest
+    needs: [test-backend]  # Only build if tests pass
 
     steps:
     - name: Checkout code
@@ -57,6 +127,7 @@ jobs:
 
   build-frontend:
     runs-on: ubuntu-latest
+    needs: [test-frontend]  # Only build if tests pass
 
     steps:
     - name: Checkout code
@@ -88,6 +159,8 @@ jobs:
         context: ./frontend
         file: ./frontend/Dockerfile
         push: true
+        build-args: |
+          NEXT_PUBLIC_API_URL=https://glow-backend-v4-0-0.onrender.com/api
         tags: ${{ steps.meta-frontend.outputs.tags }}
         labels: ${{ steps.meta-frontend.outputs.labels }}
         cache-from: type=gha