fix checkout tests

R/checkout.R

@@ -111,16 +111,28 @@ checkout <- function(repos = NULL,
     restore(lockfile = lockfile, clean = clean)
 
     # re-generate the activate script
-    args <- c("--vanilla", "-s", "-e", shQuote("renv::activate()"))
-    r(args)
+    local({
+
+      # make sure we can find 'renv' on the library paths
+      renv_scope_libpaths(the$library_path)
+
+      # invoke activate
+      args <- c("--vanilla", "-s", "-e", shQuote("renv::activate()"))
+      r(args)
+
+    })
 
     # update the renv lockfile record
+    # (note: it might not be available when running tests)
     local({
+
+      renv <- renv_lockfile_records(lockfile)[["renv"]]
+      if (is.null(renv))
+        return()
+
       renv_scope_options(renv.verbose = FALSE)
-      record(
-        records = renv_lockfile_records(lockfile)["renv"],
-        project = project
-      )
+      record(records = list(renv = renv), project = project)
+
     })
 
   }

R/zzz.R

@@ -4,6 +4,15 @@
   # NOTE: needs to be visible to embedded instances of renv as well
   the$envir_self <<- renv_envir_self()
 
+  # figure out where 'renv' was loaded from -- if tests are running
+  # and we're using devtools::load_all(), we might need to fall back
+  # to whatever version of renv is available on the library paths
+  load <- Sys.getenv("DEVTOOLS_LOAD", unset = NA)
+  the$library_path <<- if (identical(load, .packageName))
+    dirname(renv_package_find(.packageName))
+  else
+    libname
+
   # make sure renv (and packages using renv!!!) use tempdir for storage
   # when running tests, or R CMD check
   if (checking() || testing()) {

tests/testthat/helper-scope.R

@@ -76,3 +76,8 @@ renv_scope_local <- function() {
   path <- renv_tests_path("local")
   renv_scope_envvars(RENV_PATHS_LOCAL = path, scope = parent.frame())
 }
+
+renv_tests_dependencies <- function(packages) {
+  code <- sprintf("library(%s)", packages)
+  cat(code, file = "dependencies.R", sep = "\n", append = TRUE)
+}

tests/testthat/test-checkout.R

@@ -2,10 +2,12 @@
 test_that("we can check out packages from our local repository", {
 
   # enter test scope
-  project <- renv_tests_scope("breakfast")
+  project <- renv_tests_scope()
+  init()
 
   # check out a package + its dependencies; this invocation is
   # similar in spirit to a plain `install()` call
+  renv_tests_dependencies("breakfast")
   checkout(packages = "breakfast")
 
   # check that they were installed