example_url() improvements (#665)

Fixes #663

Author: hadley

R/test.R

@@ -18,12 +18,16 @@ request_test <- function(template = "/get", ...) {
 #'
 #' @keywords internal
 #' @export
-example_url <- function() {
+example_url <- function(path = "/") {
   check_installed("webfakes")
   if (is_testing() && !is_interactive()) {
     testthat::skip_on_covr()
   }
+  env_cache(the, "test_app", example_app())
+  the$test_app$url(path)
+}
 
+example_app <- function() {
   app <- webfakes::httpbin_app()
   # paginated iris endpoint
   app$get("/iris", function(req, res) {
@@ -47,13 +51,10 @@ example_url <- function() {
     )
   })
 
-  env_cache(the, "test_app",
-    webfakes::new_app_process(
-      app,
-      opts = webfakes::server_opts(num_threads = 6, enable_keep_alive = TRUE)
-    )
+  webfakes::new_app_process(
+    app,
+    opts = webfakes::server_opts(num_threads = 6, enable_keep_alive = TRUE)
   )
-  the$test_app$url()
 }
 
 #' @export

man/example_url.Rd

@@ -1,6 +1,5 @@
 test_that("can perform multiple requests", {
-  req <- request(example_url()) %>%
-    req_url_path("/iris") %>%
+  req <- request(example_url("/iris")) %>%
     req_url_query(limit = 5)
 
   resps <- req_perform_iterative(
@@ -14,8 +13,7 @@ test_that("can perform multiple requests", {
 })
 
 test_that("can save results to disk", {
-  req <- request(example_url()) %>%
-    req_url_path("/iris") %>%
+  req <- request(example_url("/iris")) %>%
     req_url_query(limit = 5)
 
   dir <- withr::local_tempdir()
@@ -32,8 +30,7 @@ test_that("can save results to disk", {
 })
 
 test_that("user temination still returns data", {
-  req <- request(example_url()) %>%
-    req_url_path("/iris") %>%
+  req <- request(example_url("/iris")) %>%
     req_url_query(limit = 5)
   next_req <- function(resp, req) interrupt()
 
@@ -45,8 +42,7 @@ test_that("user temination still returns data", {
 
 
 test_that("can retrieve all pages", {
-  req <- request(example_url()) %>%
-    req_url_path("/iris") %>%
+  req <- request(example_url("/iris")) %>%
     req_url_query(limit = 1)
 
   i <- 1

tests/testthat/test-iterate.R

@@ -22,18 +22,16 @@ test_that("can read/write cookies", {
 })
 
 test_that("can set cookies", {
-  resp <- request(example_url()) %>%
+  resp <- request(example_url("/cookies")) %>%
     req_cookies_set(a = 1, b = 1) %>%
-    req_url_path("/cookies") %>%
     req_perform()
 
   expect_equal(resp_body_json(resp), list(cookies = list(a = "1", b = "1")))
 })
 
 test_that("cookie values are usually escaped", {
-  resp <- request(example_url()) %>%
+  resp <- request(example_url("/cookies")) %>%
     req_cookies_set(a = I("%20"), b = "%") %>%
-    req_url_path("/cookies") %>%
     req_perform()
 
   expect_equal(resp_body_json(resp), list(cookies = list(a = "%20", b = "%25")))

tests/testthat/test-req-cookies.R

@@ -1,5 +1,5 @@
 test_that("req_stream() is deprecated", {
-  req <- request(example_url()) %>% req_url_path("/stream-bytes/100")
+  req <- request(example_url("/stream-bytes/100"))
   expect_snapshot(
     resp <- req_stream(req, identity, buffer_kb = 32)
   )

tests/testthat/test-req-perform-stream.R

@@ -114,8 +114,7 @@ test_that("can cache requests with etags", {
 })
 
 test_that("can cache requests with paths (cache-control)", {
-  req <- request(example_url()) %>%
-    req_url_path("/cache/2") %>%
+  req <- request(example_url("/cache/2")) %>%
     req_cache(withr::local_tempfile())
 
   path1 <- withr::local_tempfile()
@@ -146,8 +145,7 @@ test_that("can cache requests with paths (cache-control)", {
 })
 
 test_that("can cache requests with paths (if-modified-since)", {
-  req <- request(example_url()) %>%
-    req_url_path("/cache") %>%
+  req <- request(example_url("/cache")) %>%
     req_cache(tempfile())
 
   path1 <- tempfile()

tests/testthat/test-req-perform.R

@@ -1,7 +1,7 @@
 test_that("can extract url components from a response", {
   resp <- req_perform(request_test("/get?a=1&b=2"))
 
-  expect_equal(resp_url(resp), paste0(example_url(), "get?a=1&b=2"))
+  expect_equal(resp_url(resp), example_url("/get?a=1&b=2"))
   expect_equal(resp_url_path(resp), "/get")
   expect_equal(resp_url_queries(resp), list(a = "1", b = "2"))