More obvious env var naming

Author: cpsievert

.github/workflows/R-CMD-check.yaml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release', vdiffr: true, node: "8.x", shinytest: true}
+          - {os: macOS-latest,   r: 'release', visual_tests: true, node: "14.x", shinytest: true}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
           - {os: ubuntu-18.04,   r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.1.0 (ubuntu-18.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
@@ -39,7 +39,7 @@ jobs:
 
     env:
       RSPM: ${{ matrix.config.rspm }}
-      VDIFFR: ${{ matrix.config.vdiffr }}
+      VISUAL_TESTS: ${{ matrix.config.visual_tests }}
       SHINYTEST: ${{ matrix.config.shinytest }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
@@ -84,7 +84,7 @@ jobs:
           node-version: ${{ matrix.config.node }}
 
       - name: Install orca
-        if: matrix.config.vdiffr == true
+        if: matrix.config.visual_tests == true
         run: npm install -g [email protected] orca
         shell: bash
 

tests/testthat/helper-vdiffr.R

@@ -1,10 +1,9 @@
-# If VDIFFR is TRUE, enable visual testing
-enable_vdiffr <- grepl("true", Sys.getenv("VDIFFR"), fixed = TRUE)
+visual_testing <- grepl("true", Sys.getenv("VISUAL_TESTS"), fixed = TRUE)
 
-message("Visual testing is ", if (!enable_vdiffr) "not ", "enabled.")
+message("Visual testing is ", if (!visual_testing) "not ", "enabled.")
 
 # start up the orca image server
-if (enable_vdiffr) {
+if (visual_testing) {
   # try 20 random ports
   for (vdiff_port_tries in 1:20) {
     port <- floor(runif(1, 3001, 8000))
@@ -21,7 +20,7 @@ if (enable_vdiffr) {
 
 expect_doppelganger <- function(p, name, ...) {
 
-  if (!enable_vdiffr) {
+  if (!visual_testing) {
     return(invisible(NULL))
   }