Fix accidental override in skip_on_cran() (#1869)

Fixes #1868
r-lib · Sep 26, 2023 · 97887bc · 97887bc
1 parent b138bf7
commit 97887bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # testthat (development version)
 
+* `options(rlang_interactive = TRUE)` no longer causes `skip_on_cran()` to
+  not run on CRAN (#1868).
+
 * The skip column is now two characters wide to have a consistent width in case
   10 or more tests are skipped in a single file (@mgirlich, #1844).
 

diff --git a/R/skip.R b/R/skip.R
@@ -249,7 +249,7 @@ on_bioc <- function() {
   env_var_is_true("IS_BIOC_BUILD_MACHINE")
 }
 on_cran <- function() {
-  !is_interactive() && !env_var_is_true("NOT_CRAN")
+  !interactive() && !env_var_is_true("NOT_CRAN")
 }
 
 env_var_is_true <- function(x) {

diff --git a/tests/testthat/test-skip.R b/tests/testthat/test-skip.R
@@ -62,12 +62,11 @@ test_that("skip_on_cran() works as expected", {
   expect_no_skip(skip_on_cran())
 
   withr::local_envvar(NOT_CRAN = "false")
-  withr::local_options(rlang_interactive = FALSE)
+  local_mocked_bindings(interactive = function() FALSE)
   expect_snapshot_skip(skip_on_cran(), cran = TRUE)
 
-  withr::local_options(rlang_interactive = TRUE)
+  local_mocked_bindings(interactive = function() TRUE)
   expect_no_skip(skip_on_cran())
-
 })
 
 test_that("skip_on_ci() works as expected", {