Set package in test_active_file() (#2471)

* Set package in `test_active_file()`, and update tests so they actually fail if not set correctly. Fixes #2470

* Re-load testthat outside of testthat so that devtools works with testthat once more.

DESCRIPTION

@@ -35,7 +35,7 @@ Imports:
     rversions (>= 2.1.1),
     sessioninfo (>= 1.2.2),
     stats,
-    testthat (>= 3.1.4),
+    testthat (>= 3.1.4.9000),
     tools,
     urlchecker (>= 1.0.1),
     utils,
@@ -68,3 +68,5 @@ Language: en-US
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.1
 Config/testthat/edition: 3
+Remotes:  
+    r-lib/testthat

NEWS.md

@@ -1,5 +1,11 @@
 # devtools (development version)
 
+* `test_active_file()` passes the package onto to testthat so it can correctly
+  set the `TESTTHAT_PKG` envvar (#2470).
+
+* You can once again use `devtools::test()` and `devtools::test_active_file()`
+  with the testthat package.
+
 * `check(cran = TRUE)` sets the env var
   `_R_CHECK_PACKAGES_USED_IGNORE_UNUSED_IMPORTS_` to `FALSE`, in order to
   surface the `"Namespace in Imports field not imported from"` NOTE. This only

R/test.R

@@ -37,10 +37,13 @@ test <- function(pkg = ".", filter = NULL, stop_on_failure = FALSE, export_all =
 
   cli::cli_inform(c(i = "Testing {.pkg {pkg$package}}"))
   withr::local_envvar(r_env_vars())
+
+  load_package <- load_package_if_needed(pkg)
   testthat::test_local(
     pkg$path,
     filter = filter,
     stop_on_failure = stop_on_failure,
+    load_package = load_package,
     ...
   )
 }
@@ -63,7 +66,25 @@ test_active_file <- function(file = find_active_file(), ...) {
   if (is_rstudio_running()) {
     rstudioapi::executeCommand("activateConsole", quiet = TRUE)
   }
-  testthat::test_file(test_files, ..., load_package = "source")
+
+  load_package <- load_package_if_needed(pkg)
+  testthat::test_file(
+    test_files,
+    package = pkg$package,
+    load_package = load_package,
+    ...
+  )
+}
+
+load_package_if_needed <- function(pkg) {
+  if (pkg$package == "testthat") {
+    # Must load testthat outside of testthat so tests are run with
+    # dev testthat
+    load_all(pkg$path, quiet = TRUE)
+    "none"
+  } else {
+    "source"
+  }
 }
 
 #' @param show_report Show the test coverage report.

tests/testthat/test-test.R

@@ -31,8 +31,19 @@ test_that("devtools::test_active_file works", {
   expect_equal(length(out), 1)
 })
 
-test_that("TESTTHAT_PKG environment varaible is set", {
-  test_test(test_path("testTest"), filter = "envvar")
+test_that("TESTTHAT_PKG environment variable is set", {
+  withr::local_envvar("TESTTHAT_PKG" = "incorrect")
+
+  test_test(
+    test_path("testTest"),
+    filter = "envvar",
+    stop_on_failure = TRUE
+  )
+  test_active_file(
+    test_path("testTest/tests/testthat/test-envvar.R"),
+    stop_on_failure = TRUE
+  )
+
   expect_true(TRUE)
 })