Use expect_no_error over custom helper (#435)

tidyverse · Jun 27, 2023 · 74a69a3 · 74a69a3
1 parent b87d89e
commit 74a69a3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -37,7 +37,7 @@ Suggests:
     mockr,
     rmarkdown,
     spelling,
-    testthat (>= 3.1.3)
+    testthat (>= 3.1.5)
 VignetteBuilder: 
     knitr
 Config/Needs/website:

diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
@@ -17,10 +17,6 @@ with_mock <- function(..., .parent = parent.frame()) {
   mockr::with_mock(..., .parent = .parent, .env = "googledrive")
 }
 
-expect_error_free <- function(...) {
-  expect_error(..., regexp = NA)
-}
-
 # usage:
 # test_fixture("something.rds")
 test_fixture <- function(name) testthat::test_path("test-fixtures", name)

diff --git a/tests/testthat/test-drive_auth.R b/tests/testthat/test-drive_auth.R
@@ -5,8 +5,8 @@ test_that("drive_auth_configure works", {
     drive_auth_configure(client = old_client, api_key = old_api_key)
   )
 
-  expect_error_free(drive_oauth_client())
-  expect_error_free(drive_api_key())
+  expect_no_error(drive_oauth_client())
+  expect_no_error(drive_api_key())
 
   expect_snapshot(
     drive_auth_configure(client = gargle::gargle_client(), path = "PATH"),

diff --git a/tests/testthat/test-drive_id-class.R b/tests/testthat/test-drive_id-class.R
@@ -72,7 +72,7 @@ test_that("presence of drive_id column doesn't prevent row binding of dribbles",
   alfa <- x[1:2, ]
   bravo <- x[3:4, ]
 
-  expect_error_free(
+  expect_no_error(
     out <- vec_rbind(alfa, bravo)
   )
   expect_equal(out[c("name", "id")], x[1:4, c("name", "id")])
@@ -102,19 +102,19 @@ test_that("gargle_map_cli() is implemented for drive_id", {
 
 ## low-level helpers
 test_that("new_drive_id() handles 0-length input and NA", {
-  expect_error_free(
+  expect_no_error(
     out <- new_drive_id(character())
   )
   expect_length(out, 0)
   expect_true(is_drive_id(out))
 
-  expect_error_free(
+  expect_no_error(
     out <- new_drive_id(NA_character_)
   )
   expect_true(is.na(out))
   expect_true(is_drive_id(out))
 
-  expect_error_free(
+  expect_no_error(
     out <- new_drive_id(c(NA_character_, "abc"))
   )
   expect_true(is.na(out[1]))

diff --git a/tests/testthat/test-utils-paths.R b/tests/testthat/test-utils-paths.R
@@ -171,7 +171,7 @@ test_that("check_for_overwrite() does its job", {
     "already exist"
   )
 
-  expect_error_free(
+  expect_no_error(
     second <- drive_create(
       me_("name-collision"),
       path = PARENT_ID,
@@ -185,7 +185,7 @@ test_that("check_for_overwrite() does its job", {
   )
   expect_false(first$id == second$id)
 
-  expect_error_free(
+  expect_no_error(
     drive_create(
       me_("name-collision"),
       path = PARENT_ID,