Polishing

Author: hadley

R/expect-output.R

@@ -37,20 +37,14 @@ expect_output <- function(
       msg <- sprintf("%s produced output.\n%s", act$lab, encodeString(act$cap))
       fail(msg, info = info)
     }
+    pass(act$val)
   } else if (is.null(regexp) || identical(act$cap, "")) {
     if (identical(act$cap, "")) {
       msg <- sprintf("%s produced no output", act$lab)
       fail(msg, info = info)
     }
+    pass(act$val)
   } else {
-    return(expect_match(
-      act$cap,
-      enc2native(regexp),
-      ...,
-      info = info,
-      label = act$lab
-    ))
+    expect_match(act$cap, enc2native(regexp), ..., info = info, label = act$lab)
   }
-
-  pass(act$val)
 }

R/expect-setequal.R

@@ -107,11 +107,11 @@ expect_mapequal <- function(object, expected) {
       vals <- paste0(encodeString(exp_miss, quote = '"'), ", ")
       fail(paste0("Names absent from `expected`: ", vals))
     }
+
+    pass(act$val)
   } else {
     expect_equal(act$val[exp_nms], exp$val)
   }
-
-  invisible(act$val)
 }
 
 check_names_ok <- function(x, label) {

tests/testthat/DELETE-ME

@@ -0,0 +1 @@
+If you see me, something has gone wrong with old-school teardown

tests/testthat/DELETE-ME-2

@@ -0,0 +1 @@
+If you see me, something has gone wrong with new-school teardown