fix #124 fixed httr reading from cached response

ropensci · Dec 3, 2019 · 9820cee · 9820cee
1 parent ff284bd
commit 9820cee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,7 @@ Description: Record test suite 'HTTP' requests and replays them during
     real 'HTTP' responses on disk in 'cassettes'. Subsequent 'HTTP' requests
     matching any previous requests in the same 'cassette' use a cached
     'HTTP' response.
-Version: 0.3.2.9531
+Version: 0.3.2.9532
 Authors@R: c(person("Scott", "Chamberlain", role = c("aut", "cre"),
     email = "sckott@protonmail.com", 
     comment = c(ORCID="0000-0003-1444-9135")))

diff --git a/R/request_handler.R b/R/request_handler.R
@@ -163,6 +163,7 @@ RequestHandler <- R6::R6Class(
     # get stubbed response
     get_stubbed_response = function(request) {
       self$stubbed_response <- http_interactions()$response_for(request)
+      scotts_env$stubbed_response_from_request_handler <- self$stubbed_response
       self$stubbed_response
     },
 

diff --git a/R/serialize_to_crul.R b/R/serialize_to_crul.R
@@ -16,15 +16,6 @@ serialize_to_crul <- function(request, response) {
   # response
   resp <- webmockr::Response$new()
   resp$set_url(request$uri)
-  # disk <- "disk" %in% names(response)
-  # response_body <- if (response$disk) {
-  #   response$disk
-  # } else {
-  #   if ("string" %in% names(response$body))
-  #     response$body$string
-  #   else
-  #     response$body
-  # }
   bod <- response$body
   resp$set_body(if ("string" %in% names(bod)) bod$string else bod,
     response$disk %||% FALSE)

diff --git a/R/serialize_to_httr.R b/R/serialize_to_httr.R
@@ -19,13 +19,12 @@ serialize_to_httr <- function(request, response) {
   resp <- webmockr::Response$new()
   resp$set_url(request$uri)
   bod <- response$body
-  disk <- "disk" %in% names(response)
   response_body <- if ("file" %in% names(bod)) {
     structure(bod$file, class = "path")
   } else {
     if ("string" %in% names(bod)) bod$string else bod
   }
-  resp$set_body(response_body, disk %||% FALSE)
+  resp$set_body(response_body, response$disk %||% FALSE)
   # resp$set_body(if ("string" %in% names(bod)) bod$string else bod)
   resp$set_request_headers(request$headers, capitalize = FALSE)
   resp$set_response_headers(response$headers, capitalize = FALSE)

diff --git a/tests/testthat/test-httr.R b/tests/testthat/test-httr.R
@@ -60,6 +60,8 @@ test_that("httr use_cassette works", {
   expect_is(x, "response")
   expect_equal(x$status_code, 404)
   expect_equal(x$url, "https://httpbin.org/404")
+  expect_output(print(x), "Not Found")
+  expect_output(print(x), "HTML PUBLIC")
 
   # response body
   str <- yaml::yaml.load_file(out$manfile)$http_interactions