Update coveralls and simplecov CI configuration (#6592)

MarkUsProject · May 22, 2023 · 91143b5 · 91143b5
1 parent 66c0fd8
commit 91143b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/test_ci.yml b/.github/workflows/test_ci.yml
@@ -2,6 +2,10 @@ name: MarkUs Tests
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+  push:
+    branches:
+      - master
+
 jobs:
   test:
     if: github.event.pull_request.draft == false
@@ -84,32 +88,34 @@ jobs:
       - name: Run chromedriver
         run: chromedriver --whitelisted-ips &
       - name: Run rspec tests
-        run: bundle exec rspec
+        run: |
+          bundle exec rspec
+          bundle exec rspec spec/system
         env:
           MARKUS__PYTHON: ./venv/bin/python3
-      - name: Run rspec system tests
-        run: bundle exec rspec spec/system
       - name: Coveralls Parallel (rspec)
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: rspec
           parallel: true
       - name: Run jest tests
         run: npm run test-cov
       - name: Coveralls Parallel (jest)
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: jest
           parallel: true
 
   finish:
     needs: test
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
+          carryforward: "rspec,jest"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -103,6 +103,8 @@
   config.before type: :system do
     # Override the default driver used by rspec system tests
     driven_by :selenium_remote_chrome
+
+    SimpleCov.command_name 'system'
   end
 
   config.after :each do |test|