More improvements

* Better handling for nested tests
* Never show locations
* Polish emoji spacing

Author: hadley

NEWS.md

@@ -1,6 +1,6 @@
 # testthat (development version)
 
-* When running a test interactively, testthat now reports the number of succeses.
+* When running a test interactively, testthat now reports the number of succeses. The results should also be more useful if you are using nested tests.
 * The hints generated by `expect_snapshot()` and `expect_snapshot_file()` now include the path to the package, if its not in the current working directory (#1577).
 * `expect_snapshot_file()` now clearly errors if the `path` doesnt exist (#2191).
 * `expect_snapshot_file()` now considers `.json` to be a text file (#1593).

R/praise.R

@@ -43,7 +43,7 @@ praise_emoji <- function() {
     "\U0001f389", # party popper
     "\U0001f38a" # confetti ball
   )
-  sample(emoji, 1)
+  paste0(" ", sample(emoji, 1))
 }
 
 encourage <- function() {

R/reporter-progress.R

@@ -558,7 +558,7 @@ spinner <- function(frames, i) {
   frames[((i - 1) %% length(frames)) + 1]
 }
 
-issue_header <- function(x, pad = FALSE) {
+issue_header <- function(x, pad = FALSE, location = TRUE) {
   type <- expectation_type(x)
   if (has_colour()) {
     type <- colourise(first_upper(type), type)
@@ -569,11 +569,11 @@ issue_header <- function(x, pad = FALSE) {
     type <- strpad(type, 7)
   }
 
-  paste0(type, expectation_location(x, " (", ")"), ": ", x$test)
+  paste0(type, if (location) expectation_location(x, " (", ")"), ": ", x$test)
 }
 
-issue_summary <- function(x, rule = FALSE) {
-  header <- cli::style_bold(issue_header(x))
+issue_summary <- function(x, rule = FALSE, location = TRUE) {
+  header <- cli::style_bold(issue_header(x, location = location))
   if (rule) {
     # Don't truncate long test names
     width <- max(cli::ansi_nchar(header) + 6, getOption("width"))

R/reporter-stop.R

@@ -2,12 +2,8 @@
 #'
 #' @description
 #' The default reporter used when [expect_that()] is run interactively.
-#' It responds by [stop()]ping on failures and doing nothing otherwise. This
-#' will ensure that a failing test will raise an error.
-#'
-#' This should be used when doing a quick and dirty test, or during the final
-#' automated testing of R CMD check.  Otherwise, use a reporter that runs all
-#' tests and gives you more context about the problem.
+#' It responds by displaying a summary of the number of successes and faiures
+#' and [stop()]ping on if there are any failures.
 #'
 #' @export
 #' @family reporters
@@ -22,6 +18,7 @@ StopReporter <- R6::R6Class(
     # Successful expectations
     n_success = 0L,
     praise = TRUE,
+    depth = 0,
 
     initialize = function(praise = TRUE) {
       super$initialize()
@@ -30,9 +27,12 @@ StopReporter <- R6::R6Class(
     },
 
     start_test = function(context, test) {
-      self$issues <- Stack$new()
-      self$n_fail <- 0L
-      self$n_success <- 0L
+      if (self$depth == 0) {
+        self$n_fail <- 0L
+        self$n_success <- 0L
+        self$issues <- Stack$new()
+      }
+      self$depth <- self$depth + 1
     },
 
     add_result = function(context, test, result) {
@@ -48,16 +48,21 @@ StopReporter <- R6::R6Class(
     },
 
     end_test = function(context, test) {
+      self$depth <- self$depth - 1
+      if (self$depth > 0) {
+        return()
+      }
+
       self$local_user_output()
 
       for (issue in self$issues$as_list()) {
-        self$cat_line(issue_summary(issue, rule = TRUE), "\n")
+        self$cat_line(issue_summary(issue, rule = TRUE, location = FALSE))
       }
 
       if (self$praise && self$n_fail == 0 && self$n_success > 0) {
         emoji <- praise_emoji()
         self$cat_line(cli::format_inline(
-          "Test passed with {self$n_success} success{?es} {emoji}."
+          "{.strong Test passed with {self$n_success} success{?es}{emoji}}."
         ))
       }
 

man/StopReporter.Rd

@@ -1,17 +1,40 @@
 # produces useful output
 
-    Test passed with 1 success .
-    -- Failure ('reporters/tests.R:13:3'): Failure:1 -------------------------------
-    Expected `x` to be TRUE.
-    Differences:
-    `actual`:   FALSE
-    `expected`: TRUE 
-    
-    
+    Code
+      with_reporter("stop", run_tests())
+    Output
+      Test passed with 1 success.
+      -- Failure: Failure:1 ----------------------------------------------------------
+      Expected `x` to be TRUE.
+      Differences:
+      `actual`:   FALSE
+      `expected`: TRUE 
+      
+    Condition
+      Error:
+      ! Test failed with 1 failure and 0 successes.
 
-# can suppress praise
+# works nicely with nested tests
 
-    
+    Code
+      with_reporter("stop", run_tests())
+    Output
+      Test passed with 2 successes.
+      -- Failure: failed then succeeded / failed-1 -----------------------------------
+      Expected FALSE to be TRUE.
+      Differences:
+      `actual`:   FALSE
+      `expected`: TRUE 
+      
+      -- Failure: failed then succeeded / failed-2 -----------------------------------
+      Expected FALSE to be TRUE.
+      Differences:
+      `actual`:   FALSE
+      `expected`: TRUE 
+      
+    Condition
+      Error:
+      ! Test failed with 2 failures and 1 success.
 
 # errors when needed
 

tests/testthat/_snaps/reporter-stop.md

@@ -0,0 +1,10 @@
+describe("succeeded", {
+  it("succeeded-1", expect_true(TRUE))
+  it("succeeded-2", expect_true(TRUE))
+})
+
+describe("failed then succeeded", {
+  it("failed-1", expect_true(FALSE))
+  it("failed-2", expect_true(FALSE))
+  it("succeeded", expect_true(TRUE))
+})

tests/testthat/reporters/nested.R

@@ -1,18 +1,28 @@
+# We can't use expect_snapshot_reporter() here because it uses test_one_file()
+# which wraps code in `test_code()` which turns the error into a test failure
+# It also only captures the output, but we also want to see the error
+
 test_that("produces useful output", {
-  expect_snapshot_reporter(StopReporter$new())
+  run_tests <- \() source(test_path("reporters/tests.R"))
+  expect_snapshot(with_reporter("stop", run_tests()), error = TRUE)
 })
 
 test_that("can suppress praise", {
-  expect_snapshot_reporter(
-    StopReporter$new(praise = FALSE),
-    test_path("reporters/successes.R")
-  )
+  run_tests <- \() source(test_path("reporters/successes.R"))
+  expect_silent(with_reporter(StopReporter$new(praise = FALSE), run_tests()))
+})
+
+test_that("works nicely with nested tests", {
+  run_tests <- \() source(test_path("reporters/nested.R"))
+  expect_snapshot(with_reporter("stop", run_tests()), error = TRUE)
 })
 
 test_that("errors when needed", {
   r <- StopReporter$new()
+  r$start_test()
   expect_no_error(r$end_test())
 
+  r$start_test()
   r$n_fail <- 1
   r$n_success <- 0
   expect_snapshot(error = TRUE, r$end_test())