Don't message if quiet = TRUE (#146)

* Don't message if `quiet = TRUE`

* Add disable too

* Add test and catch a few other cases

Author: hadley

NAMESPACE

@@ -66,6 +66,7 @@ importFrom(rlang,check_installed)
 importFrom(rlang,is_empty)
 importFrom(rlang,is_error)
 importFrom(rlang,is_function)
+importFrom(rlang,is_installed)
 importFrom(rlang,is_list)
 importFrom(rlang,is_na)
 importFrom(rlang,is_null)

R/flipswitch.R

@@ -26,8 +26,10 @@ enable <- function(adapter = NULL, options = list(), quiet = FALSE) {
     if (!adapter %in% webmockr_adapters) {
       abort("adapter must be one of 'crul', 'httr', or 'httr2'")
     }
-    if (!requireNamespace(adapter, quietly = TRUE)) {
-      message(adapter, " not installed, skipping enable")
+    if (!is_installed(adapter)) {
+      if (!quiet) {
+        message(adapter, " not installed, skipping enable")
+      }      
       return(invisible(FALSE))
     }
     http_lib_adapter_registry$adapters[[which(adnms == adapter)]]$enable(quiet)
@@ -37,8 +39,10 @@ enable <- function(adapter = NULL, options = list(), quiet = FALSE) {
       function(z) {
         pkgname <- z$client
         # check if package installed first
-        if (!requireNamespace(pkgname, quietly = TRUE)) {
-          message(pkgname, " not installed, skipping enable")
+        if (!is_installed(pkgname)) {
+          if (!quiet) {
+            message(pkgname, " not installed, skipping enable")
+          }
           FALSE
         } else {
           # if instaled, enable
@@ -70,8 +74,10 @@ disable <- function(adapter = NULL, options = list(), quiet = FALSE) {
     if (!adapter %in% webmockr_adapters) {
       abort("adapter must be one of 'crul', 'httr', or 'httr2'")
     }
-    if (!requireNamespace(adapter, quietly = TRUE)) {
-      message(adapter, " not installed, skipping disable")
+    if (!is_installed(adapter)) {
+      if (!quiet) {
+        message(adapter, " not installed, skipping disable")  
+      }
       return(invisible(FALSE))
     }
     http_lib_adapter_registry$adapters[[which(adnms == adapter)]]$disable(quiet)
@@ -81,8 +87,10 @@ disable <- function(adapter = NULL, options = list(), quiet = FALSE) {
       function(z) {
         pkgname <- z$client
         # check if package installed first
-        if (!requireNamespace(pkgname, quietly = TRUE)) {
-          message(pkgname, " not installed, skipping disable")
+        if (!is_installed(pkgname)) {
+          if (!quiet) {
+            message(pkgname, " not installed, skipping disable")
+          }
           FALSE
         } else {
           # if instaled, disable

R/webmockr-package.R

@@ -22,6 +22,6 @@
 #' @importFrom fauxpas HTTPRequestTimeout
 #' @importFrom R6 R6Class
 #' @importFrom rlang abort warn check_installed is_list is_function is_error
-#' caller_arg try_fetch caller_env
+#' caller_arg try_fetch caller_env is_installed
 ## usethis namespace: end
 NULL

tests/testthat/_snaps/flipswitch.md

@@ -0,0 +1,12 @@
+# can enable and disable quietly
+
+    Code
+      enable(quiet = TRUE)
+      disable(quiet = TRUE)
+
+---
+
+    Code
+      enable("crul", quiet = TRUE)
+      disable("crul", quiet = TRUE)
+

tests/testthat/test-flipswitch.R

@@ -79,3 +79,16 @@ test_that("enabled works", {
 
   expect_error(enabled("foobar"), "'adapter' must be in the set")
 })
+
+test_that("can enable and disable quietly", {
+  local_mocked_bindings(is_installed = function(pkg) pkg != "crul")
+
+  expect_snapshot({
+    enable(quiet = TRUE)
+    disable(quiet = TRUE)
+  })
+  expect_snapshot({
+    enable("crul", quiet = TRUE)
+    disable("crul", quiet = TRUE)
+  })
+})