Combining renderer and compiler tests

.github/workflows/tests.yaml

@@ -12,14 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: [ renderer, compiler, CRAN ]
+        test-suite: [ R_coverage, JS_coverage, CRAN ]
 
     name: Test Suite ${{ matrix.test-suite }}
     env: 
       TEST_SUITE: ${{ matrix.test-suite }}
       GITHUB_PAT: ${{ secrets.PAT_GITHUB }}
       GH_ACTION: "ENABLED"
-      COLLECT_COVERAGE: "TRUE"
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
       - uses: actions/checkout@v3
@@ -39,13 +38,13 @@ jobs:
         run: git config --global user.email toby.hocking@r-project.org
 
       - name: Setup Node.js
-        if: matrix.test-suite == 'renderer'
+        if: matrix.test-suite == 'JS_coverage'
         uses: actions/setup-node@v3
         with:
           node-version: '18'
 
       - name: Install Node.js dependencies
-        if: matrix.test-suite == 'renderer'
+        if: matrix.test-suite == 'JS_coverage'
         run: |
           npm install v8-to-istanbul
           echo "Node modules installed"
@@ -54,15 +53,16 @@ jobs:
         run: |
           if [ "$TEST_SUITE" == "CRAN" ]; then
             bash build.sh
-          elif [ "$TEST_SUITE" == "compiler" ]; then
+          elif [ "$TEST_SUITE" == "JS_coverage" ]; then
+            echo "Running testthat with JS coverage collection..."
             Rscript -e "source('tests/testthat.R', chdir = TRUE)"
-            Rscript -e 'covr::codecov(quiet = TRUE)'
           else
-            Rscript -e "source('tests/testthat.R', chdir = TRUE)"
+            echo "Running testthat with R coverage collection..."
+            Rscript -e 'covr::codecov(quiet = FALSE, type = "tests", test_files = "tests/testthat.R", flags = "r")'
           fi
 
       - name: Convert JS coverage to Istanbul format
-        if: matrix.test-suite == 'renderer'
+        if: matrix.test-suite == 'JS_coverage'
         run: |
           if [ -f "tests/testthat/js-coverage.json" ]; then
             echo "Converting JS coverage to LCOV format..."
@@ -73,7 +73,7 @@ jobs:
           fi
 
       - name: Upload JS coverage to Codecov
-        if: matrix.test-suite == 'renderer'
+        if: matrix.test-suite == 'JS_coverage'
         run: |
           if [ -f "coverage-istanbul.json" ]; then
             curl -Os https://uploader.codecov.io/latest/linux/codecov

tests/testthat.R

@@ -5,26 +5,25 @@ setwd("testthat")
 source("helper-functions.R")
 source("helper-HTML.R")
 source("helper-plot-data.r")
-filter <- Sys.getenv("TEST_SUITE")
 gh.action <- Sys.getenv("GH_ACTION")
-collect.coverage <- Sys.getenv("COLLECT_COVERAGE", "FALSE") == "TRUE" && filter=="renderer"
-if(filter == ""){
-  filter <- NULL
-}
+is_js_coverage <- Sys.getenv("TEST_SUITE") == "JS_coverage"
 message(gh.action)
 tests_init()
 # Start coverage if enabled
 coverage_active <- FALSE
-if(collect.coverage) {
+if(is_js_coverage) {
   coverage_active <- start_js_coverage()
   if(coverage_active) {
     message("JS coverage collection started")
   }
 }
 # Run tests
-tests_run(filter=filter)
+message("\n=== Running COMPILER tests ===")
+tests_run(filter = "compiler")
+message("\n=== Running RENDERER tests ===")
+tests_run(filter = "renderer")
 # Save coverage and cleanup
 if(coverage_active) {
   stop_js_coverage()
 }
-tests_exit()
+tests_exit()

tests/testthat/test-compiler-ghpages.R

@@ -67,6 +67,7 @@ test_that("animint2pages() returns list of meta-data", {
   expect_Capture(update_list)
 })
 
+# This test is skipped under covr coverage collection due to environment manipulation.
 test_that("animint2pages raises an error if no GitHub token is present", {
   if (identical(Sys.getenv("R_COVR"), "true")) skip("Skip on covr: environment manipulation not supported")
   env.names <- c("GITHUB_PAT", "GITHUB_PAT_GITHUB_COM")