Use local_mocked_bindings()

Closes #456, closes #434

Author: jennybc

DESCRIPTION

@@ -34,7 +34,6 @@ Suggests:
     curl,
     dplyr (>= 1.0.0),
     knitr,
-    mockr,
     rmarkdown,
     spelling,
     testthat (>= 3.1.5)

inst/WORDLIST

@@ -46,7 +46,6 @@ ing
 lifecycle
 lowerCamel
 magrittr
-mockr
 pkgdown
 pre
 programmatically

tests/testthat/helper.R

@@ -13,10 +13,6 @@ skip_if_no_token <- function() {
   testthat::skip_if_not(drive_has_token(), "No Drive token")
 }
 
-with_mock <- function(..., .parent = parent.frame()) {
-  mockr::with_mock(..., .parent = .parent, .env = "googledrive")
-}
-
 # usage:
 # test_fixture("something.rds")
 test_fixture <- function(name) testthat::test_path("test-fixtures", name)

tests/testthat/test-drive_get_path.R

@@ -23,6 +23,10 @@ test_that("get_last_path_part() works", {
 })
 
 test_that("resolve_paths() works, basic scenarios", {
+  local_mocked_bindings(
+    root_id = function() ""
+  )
+
   # a -- b -- c -- d
   # ??? -- e
   dr_folder <-
@@ -43,22 +47,12 @@ test_that("resolve_paths() works, basic scenarios", {
     id = "4",
     drive_resource = list(list(kind = "drive#file", parents = list(list("3"))))
   )
-  with_mock(
-    root_id = function() "",
-    {
-      out <- resolve_paths(as_dribble(x), ancestors)
-    }
-  )
+  out <- resolve_paths(as_dribble(x), ancestors)
   expect_equal(out$path, "a/b/c/d")
 
   # target is a folder
   x$drive_resource <- list(c(dr_folder, parents = list(list("3"))))
-  with_mock(
-    root_id = function() "",
-    {
-      out <- resolve_paths(as_dribble(x), ancestors)
-    }
-  )
+  out <- resolve_paths(as_dribble(x), ancestors)
   expect_equal(out$path, "a/b/c/d/")
 
   # target's parent is not among the elders
@@ -67,16 +61,15 @@ test_that("resolve_paths() works, basic scenarios", {
     id = "4",
     drive_resource = list(list(kind = "drive#file", parents = list(list("9"))))
   )
-  with_mock(
-    root_id = function() "",
-    {
-      out <- resolve_paths(as_dribble(x), ancestors)
-    }
-  )
+  out <- resolve_paths(as_dribble(x), ancestors)
   expect_equal(out$path, "e")
 })
 
 test_that("resolve_paths() works, with some name duplication", {
+  local_mocked_bindings(
+    root_id = function() ""
+  )
+
   #     name(id)
   #      ___~(1) __
   #     /       \    \
@@ -110,12 +103,8 @@ test_that("resolve_paths() works, with some name duplication", {
       list(kind = "drive#file", parents = list(list("7")))
     )
   )
-  with_mock(
-    root_id = function() "",
-    {
-      out <- resolve_paths(as_dribble(x), ancestors)
-    }
-  )
+  out <- resolve_paths(as_dribble(x), ancestors)
+
   expect_equal(out$path[1], "~/a/b/c")
   expect_equal(out$path[2], "~/b/a/d")
 })

tests/testthat/test-utils-paths.R

@@ -136,18 +136,16 @@ test_that("rationalize_path_name() won't hit API if we can infer `path` is a fol
 })
 
 test_that("rationalize_path_name() populates `path` and `name` and correctly", {
-  with_mock(
-    confirm_clear_path = function(path, name) NULL,
-    {
-      expect_identical(
-        rationalize_path_name(path = "FILE_NAME", name = NULL),
-        list(path = NULL, name = "FILE_NAME")
-      )
-      expect_identical(
-        rationalize_path_name(path = "PARENT_FOLDER/FILE_NAME", name = NULL),
-        list(path = "PARENT_FOLDER/", name = "FILE_NAME")
-      )
-    }
+  local_mocked_bindings(
+    confirm_clear_path = function(path, name) NULL
+  )
+  expect_identical(
+    rationalize_path_name(path = "FILE_NAME", name = NULL),
+    list(path = NULL, name = "FILE_NAME")
+  )
+  expect_identical(
+    rationalize_path_name(path = "PARENT_FOLDER/FILE_NAME", name = NULL),
+    list(path = "PARENT_FOLDER/", name = "FILE_NAME")
   )
 })