included account tests in coverage report

ChicoState · Dec 11, 2023 · 5195d46 · 5195d46
1 parent 7d70e5a
commit 5195d46
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -3,11 +3,11 @@ on:
   push:
     branches:
       - main
-      - tidyup
+      - COV
   pull_request:
     branches:
       - main
-      - tidyup
+      - COV
 
 jobs:
   install:
@@ -34,18 +34,34 @@ jobs:
           cd ScheduleBuilder
           pip install -r requirements.txt
 
-      - name: Run Tests with Coverage
+      - name: Run Google Calendar Tests with Coverage
         env:
           CAL_ID: c_6ed17073345c64d5b392f5a8ef7b4a62938f12c8fc5fecfa4b7256ef88acad28@group.calendar.google.com
         run: |
-          cd ScheduleBuilder/google_calendar
+          cd ScheduleBuilder
+          python manage.py makemigrations
+          python manage.py migrate
+          cd account
+          pytest --cov=./ --cov-report=xml regtests.py
+
+      - name: Run Account Tests with Coverage
+        env:
+          CAL_ID: c_6ed17073345c64d5b392f5a8ef7b4a62938f12c8fc5fecfa4b7256ef88acad28@group.calendar.google.com
+        run: |
+          cd ScheduleBuilder/account
           pytest --cov=./ --cov-report=xml test.py
+          
+      - name: Combine Coverage Reports
+        run: |
+          cd ScheduleBuilder
+          coverage combine google_calendar/coverage.xml account/coverage.xml
+          coverage xml -o combined_coverage.xml
 
       - name: Upload Coverage to Codecov
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./ScheduleBuilder/google_calendar/coverage.xml
+          files: ./ScheduleBuilder/combined_coverage.xml
           fail_ci_if_error: true