fix texts: make real requests in request tests

Author: vcameron1

tests/testthat/test-coleo_request.R

@@ -9,85 +9,53 @@ without_internet({
 })
 
 
-with_mock_dir("coleo_request", {
-  test_that("no answer for a nonsense code", {
-    nonsense_request <- coleo_request_general(endpoint = "cells", response_as_df = FALSE, schema = "public", 'cell_code' = "eq.foo")
-
-    expect_equal(httr2::resp_body_json(nonsense_request), list())
-  })
+test_that("no answer for a nonsense code", {
+  nonsense_request <- coleo_request_general(endpoint = "cells", response_as_df = FALSE, schema = "public", 'cell_code' = "eq.foo")
+  expect_equal(httr2::resp_body_json(nonsense_request), list())
 })
 
 # query for a real site
-
-with_mock_dir("coleo_request_real", {
-  test_that("returns answer for a real code",{
-    real_site <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
-
-    answer <- httr2::resp_body_json(real_site)[[1]]
-
-    expect_equal(length(answer), 6)
-
-  })
+test_that("returns answer for a real code",{
+  real_site <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
+  answer <- httr2::resp_body_json(real_site)[[1]]
+  expect_equal(length(answer), 6)
 })
 
 
-with_mock_dir("coleo_request_real", {
-    real_cell <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
-    real_cell_df <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87", response_as_df = TRUE)
-
-    resp_body <- httr2::resp_body_json(real_cell)[[1]]
-
-
-    test_that("response is in expected format", {
-      expect_equal(length(resp_body), 6)
-
-      # can pluck one id successfully from site request
-      expect_equal(coleo_extract_id(real_cell), 161)
-
-      expect_type(real_cell_df, "list")
-
-    })
-
+real_cell <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
+real_cell_df <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87", response_as_df = TRUE)
+resp_body <- httr2::resp_body_json(real_cell)[[1]]
+test_that("response is in expected format", {
+  expect_equal(length(resp_body), 6)
+  # can pluck one id successfully from site request
+  expect_equal(coleo_extract_id(real_cell), 161)
+  expect_type(real_cell_df, "list")
 })
 
 test_that("errors for bad endpoint", {
   expect_error(coleo_request_general(endpoint = "not_an_endpoint"))
 })
 
-with_mock_dir("site id download and extraction", {
-
-  real_site <- coleo_request_general(endpoint = "sites", schema = "public", "site_code" = "eq.139_87_F01")
-
-  test_that("request_general works for a valid site", {
-
-
-    resp_body <- httr2::resp_body_json(real_site)[[1]]
-
-    # should be 11 columns of info for this site
+# Site id download and extraction
+real_site <- coleo_request_general(endpoint = "sites", schema = "public", "site_code" = "eq.139_87_F01")
+test_that("request_general works for a valid site", {
+  resp_body <- httr2::resp_body_json(real_site)[[1]]
+  # should be 11 columns of info for this site
   expect_equal(length(names(resp_body)), 12)
 })
+test_that("can coleo_pluck_id correctly", {
+  expect_equal(coleo_extract_id(real_site), 94)
+})
 
-  test_that("can coleo_pluck_id correctly", {
-    expect_equal(coleo_extract_id(real_site), 94)
-  })
-
-  })
-
-
-with_mock_dir("Site processing works correctly", {
-
-  resp_df <- coleo_request_general(endpoint = "sites", response_as_df = TRUE, schema = "public", "site_code" = "eq.137_107_H02")
-
-  test_that("resp is easily processed", {
-    # This processing step returns everything in one row
-    expect_equal(nrow(resp_df), 1)
-    # things should be unnested now; here is one example
-    expect_equal(length(resp_df$id), 1)
-    # coluns should be of the right class
-    expect_type(resp_df$type, "character")
-  })
-
-
+# Site processing works correctly
+resp_df <- coleo_request_general(endpoint = "sites", response_as_df = TRUE, schema = "public", "site_code" = "eq.137_107_H02")
+test_that("resp is easily processed", {
+  # This processing step returns everything in one row
+  expect_equal(nrow(resp_df), 1)
+  # things should be unnested now; here is one example
+  expect_equal(length(resp_df$id), 1)
+  # coluns should be of the right class
+  expect_type(resp_df$type, "character")
 })