Skip to content

Don't message if quiet = TRUE #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sckott merged 3 commits into from
Jul 2, 2025
Merged

Don't message if quiet = TRUE #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d2aa06
Don't message if `quiet = TRUE`
hadley Jul 2, 2025
b9fee28
Add disable too
hadley Jul 2, 2025
768b611
Add test and catch a few other cases
hadley Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 16 additions & 8 deletions R/flipswitch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion R/webmockr-package.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 12 additions & 0 deletions tests/testthat/_snaps/flipswitch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

13 changes: 13 additions & 0 deletions tests/testthat/test-flipswitch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
})
Loading