Fix message typos (#1824)

And tweak failure mesage
---------

Co-authored-by: Hadley Wickham <[email protected]>

Author: kevinushey

NEWS.md

@@ -41,7 +41,7 @@
 
 * `expect_error()`, `expect_warning()`, and `expect_message()` now correctly
   enforce that the condition is of the expected base class (e.g. error, 
-  warning, messsage) even when the `class` argument is used (#1168).
+  warning, message) even when the `class` argument is used (#1168).
 
 * `it()` now calls `local_test_context()` so that it behaves more
   similarly to `test_that()` (#1731), and is now exported so that you
@@ -483,7 +483,7 @@ Learn more in `vignette("third-edition")`.
 
 * Messages are no longer automatically silenced. Either use 
   `suppressMessages()` to hide unimportant messages, or
-  `expect_messsage()` to catch important messages (#1095).
+  `expect_message()` to catch important messages (#1095).
 
 * `setup()` and `teardown()` are deprecated in favour of test fixtures.
   See `vignette("test-fixtures")` for more details.

R/expect-no-condition.R

@@ -68,7 +68,7 @@ expect_no_message <- function(object,
                               class = NULL
                               ) {
   check_dots_empty()
-  expect_no_("messsage", {{ object }}, regexp = message, class = class)
+  expect_no_("message", {{ object }}, regexp = message, class = class)
 }
 
 #' @export
@@ -111,8 +111,8 @@ expect_no_ <- function(base_class,
           "."
         )
         actual <- paste0(
-          "Actually got a <", class(cnd)[[1]], ">:\n",
-          indent_lines(rlang::cnd_message(cnd, prefix = TRUE))
+          "Actually got a <", class(cnd)[[1]], "> with text:\n",
+          indent_lines(rlang::cnd_message(cnd))
         )
         message <- format_error_bullets(c(expected, i = actual))
         fail(message, trace_env = error_call)

tests/testthat/_snaps/expect-no-condition.md

@@ -1,35 +1,68 @@
+# expect_no_* conditions behave as expected
+
+    Expected `stop("error")` to run without any errors.
+    i Actually got a <simpleError> with text:
+      error
+
+---
+
+    Expected `warning("warning")` to run without any warnings.
+    i Actually got a <simpleWarning> with text:
+      warning
+
+---
+
+    Expected `message("message")` to run without any messages.
+    i Actually got a <simpleMessage> with text:
+      message
+      
+
+---
+
+    Expected `abort("error")` to run without any errors.
+    i Actually got a <rlang_error> with text:
+      error
+
+---
+
+    Expected `warn("warning")` to run without any warnings.
+    i Actually got a <rlang_warning> with text:
+      warning
+
+---
+
+    Expected `inform("message")` to run without any messages.
+    i Actually got a <rlang_message> with text:
+      message
+
 # matched conditions give informative message
 
     Code
       expect_no_warning(foo())
     Condition
       Error:
       ! Expected `foo()` to run without any warnings.
-      i Actually got a <test>:
-        Warning:
+      i Actually got a <test> with text:
         This is a problem!
     Code
       expect_no_warning(foo(), message = "problem")
     Condition
       Error:
       ! Expected `foo()` to run without any warnings matching pattern 'problem'.
-      i Actually got a <test>:
-        Warning:
+      i Actually got a <test> with text:
         This is a problem!
     Code
       expect_no_warning(foo(), class = "test")
     Condition
       Error:
       ! Expected `foo()` to run without any warnings of class 'test'.
-      i Actually got a <test>:
-        Warning:
+      i Actually got a <test> with text:
         This is a problem!
     Code
       expect_no_warning(foo(), message = "problem", class = "test")
     Condition
       Error:
       ! Expected `foo()` to run without any warnings of class 'test' matching pattern 'problem'.
-      i Actually got a <test>:
-        Warning:
+      i Actually got a <test> with text:
         This is a problem!
 

tests/testthat/test-expect-no-condition.R

@@ -1,3 +1,18 @@
+
+test_that("expect_no_* conditions behave as expected", {
+
+  # base R
+  expect_snapshot_failure(expect_no_error(stop("error")))
+  expect_snapshot_failure(expect_no_warning(warning("warning")))
+  expect_snapshot_failure(expect_no_message(message("message")))
+
+  # rlang equivalents
+  expect_snapshot_failure(expect_no_error(abort("error")))
+  expect_snapshot_failure(expect_no_warning(warn("warning")))
+  expect_snapshot_failure(expect_no_message(inform("message")))
+
+})
+
 test_that("unmatched conditions bubble up", {
   expect_error(expect_no_error(abort("foo"), message = "bar"), "foo")
   expect_warning(expect_no_warning(warn("foo"), message = "bar"), "foo")