#149 crul mocking changes, not done yet

Author: sckott

DESCRIPTION

@@ -42,6 +42,7 @@ Suggests:
     httr2,
     diffobj,
     withr
+Remotes: ropensci/crul@change-mocking, ropensci/vcr@remove-webmockr
 RoxygenNote: 7.3.2
 Config/testthat/edition: 3
 X-schema.org-applicationCategory: Web

R/adapter-crul.R

@@ -75,6 +75,18 @@ build_crul_request <- function(x) {
   )
 }
 
+crul_mock <- function(on = TRUE) {
+  check_installed("crul")
+  if (on) {
+    options(crul_mock = function(req) {
+      webmockr::CrulAdapter$new()$handle_request(req)
+    })
+  } else {
+    options(crul_mock = NULL)
+  }
+  invisible(on)
+}
+
 #' @rdname Adapter
 #' @export
 #' @keywords internal
@@ -89,7 +101,8 @@ CrulAdapter <- R6::R6Class(
   ),
   private = list(
     pluck_url = function(request) request$url$url,
-    mock = function(on) crul::mock(on),
+    # mock = function(on) crul::mock(on),
+    mock = function(on) crul_mock(on),
     build_request = build_crul_request,
     build_response = build_crul_response,
     fetch_request = function(request) {

R/adapter.R

@@ -42,7 +42,7 @@ Adapter <- R6::R6Class(
 
       switch(
         self$client,
-        crul = crul::mock(on = TRUE),
+        crul = crul_mock(on = TRUE),
         httr = httr_mock(on = TRUE),
         httr2 = httr2_mock(on = TRUE)
       )
@@ -61,7 +61,7 @@ Adapter <- R6::R6Class(
 
       switch(
         self$client,
-        crul = crul::mock(on = FALSE),
+        crul = crul_mock(on = FALSE),
         httr = httr_mock(on = FALSE),
         httr2 = httr2_mock(on = FALSE)
       )

tests/testthat/test-b-no-cassette-in-use.R

@@ -1,16 +1,16 @@
 test_that("no cassette in use behaves as expected", {
   skip_if_not_installed("vcr")
   library("vcr")
+  library("httr")
   dir <- tempdir()
   invisible(vcr_configure(dir = dir))
 
-  crul::mock()
-  x <- crul::HttpClient$new(url = hb())
+  enable()
 
   # when no cassette in use, we get expected vcr error
   expect_error(
-    x$get("get"),
-    "There is currently no cassette in use"
+    GET(url = hb(), path = "get"),
+    "Failed to find matching request"
   )
 
   # cleanup