WIP: use httptest for API mocking

DESCRIPTION

@@ -25,9 +25,9 @@ Maintainer: Tamás Stirling <[email protected]>
 LazyLoad: yes
 LazyData: yes
 Encoding: UTF-8
-Depends:
+Depends: 
     R (>= 3.0)
-Imports:
+Imports: 
     xml2,
     httr,
     rvest,
@@ -41,14 +41,15 @@ Imports:
     base64enc,
     rlang,
     utils
-Suggests:
-    testthat,
-    rcdk,
+Suggests: 
     covr,
-    robotstxt,
+    httptest,
     knitr,
-    rmarkdown,
     plot.matrix,
+    rcdk,
+    rmarkdown,
+    robotstxt,
+    testthat,
     usethis,
     vcr
 RoxygenNote: 7.2.3

NEWS.md

@@ -4,6 +4,9 @@
 
 * `pc_prop()` returned `NA` without much further explanation if any of the queries were not positive integers. The updated function attempts to coerce queries to positive integers, only progresses valid queries, and prints informative messages along the way if verbose messages are enabled.
 
+## MINOR CHANGES
+* The `test_service_down` argument has been removed from `chembl_query()`.  Since it was only intended for use in testing, it shouldn't impact code using this function.
+
 # webchem 1.3.0
 
 ## NEW FEATURES

R/chembl.R

@@ -7,7 +7,6 @@
 #' @param cache_file character; the name of the cache file without the file
 #' extension. If \code{NULL}, results are not cached.
 #' @param verbose logical; should a verbose output be printed on the console?
-#' @param test_service_down logical; this argument is only used for testing.
 #' @return The function returns a list of lists, where each element of the list
 #' contains a list of respective query results. Results are simplified, if
 #' possible.
@@ -56,8 +55,7 @@
 chembl_query <- function(query,
                          resource = "molecule",
                          cache_file = NULL,
-                         verbose = getOption("verbose"),
-                         test_service_down = FALSE) {
+                         verbose = getOption("verbose")) {
   resource <- match.arg(resource, chembl_resources())
   stem <- "https://www.ebi.ac.uk/chembl/api/data"
   foo <- function(query, verbose) {
@@ -70,8 +68,7 @@ chembl_query <- function(query,
       return(NA)
     }
     if (verbose) webchem_message("query", query, appendLF = FALSE)
-    url <- ifelse(
-      test_service_down, "", paste0(stem, "/", resource, "/", query, ".json"))
+    url <- paste0(stem, "/", resource, "/", query, ".json")
     webchem_sleep(type = "API")
     res <- try(httr::RETRY("GET",
                            url,

inst/httptest/redact.R

@@ -0,0 +1,11 @@
+#shortens file paths created by httptest so that R CMD check doesn't complain
+httptest::set_redactor(
+  function (resp) {
+    resp |>
+      httptest::gsub_response("property/.*/", "property/") |>
+      httptest::gsub_response("www.ebi.ac.uk-80/webservices/chebi/2.0/", "chebi/") |>
+      httptest::gsub_response("www.ebi.ac.uk/chembl/api/data/", "chembl/") |>
+      httptest::gsub_response("api.rsc.org/compounds/v1/filter/", "cs/") |>
+      httptest::gsub_response("webetox.uba.de/webETOX/public/search/", "etox/")
+  }
+)