Tweak blank lines/skips in CompactProgressReporter

Author: hadley

R/reporter-progress.R

@@ -345,18 +345,25 @@ CompactProgressReporter <- R6::R6Class("CompactProgressReporter",
       self$cat_tight(paste(summary, collapse = "\n\n"))
 
       self$cat_line()
-      self$cat_line()
     },
 
     end_reporter = function() {
-      skip_report(self)
+      had_feedback <- self$n_fail > 0 || self$n_warn > 0
+
+      if (self$n_skip > 0) {
+        if (!had_feedback) {
+          self$cat_line()
+        }
+        self$cat_line()
+        skip_report(self)
+      }
 
-      if (self$n_fail > 0 || self$n_warn > 0 || self$n_skip > 0) {
+      if (had_feedback) {
         self$show_status()
         self$cat_line()
       } else if (self$is_full()) {
         self$cat_line(" Terminated early")
-      } else if (!self$rstudio) {
+      } else if (self$n_skip == 0 && !self$rstudio) {
         self$cat_line(cli::style_bold(" Done!"))
       }
     },

tests/testthat/_snaps/reporter-progress.md

@@ -353,7 +353,6 @@
      1. \-f()
      2.   \-testthat::expect_true(FALSE)
 
-    
     [ FAIL 2 | WARN 0 | SKIP 0 | PASS 1 ]
     [ FAIL 3 | WARN 0 | SKIP 0 | PASS 1 ]
     [ FAIL 4 | WARN 0 | SKIP 0 | PASS 1 ]
@@ -369,7 +368,6 @@
      2.   \-g()
      3.     \-h()
 
-    
     [ FAIL 4 | WARN 0 | SKIP 0 | PASS 1 ]
     [ FAIL 4 | WARN 0 | SKIP 1 | PASS 1 ]
     [ FAIL 4 | WARN 0 | SKIP 2 | PASS 1 ]
@@ -404,6 +402,20 @@
     [ FAIL 0 | WARN 0 | SKIP 0 | PASS 6 ]
     [ FAIL 0 | WARN 0 | SKIP 0 | PASS 7 ] Done!
 
+---
+
+    
+    == Testing reporters/skips.R ===================================================
+    
+    [ FAIL 0 | WARN 0 | SKIP 0 | PASS 0 ]
+    [ FAIL 0 | WARN 0 | SKIP 1 | PASS 0 ]
+    [ FAIL 0 | WARN 0 | SKIP 2 | PASS 0 ]
+    
+    -- Skipped tests (2) -----------------------------------------------------------
+    * longer skip (1): 'reporters/skips.R:6:3'
+    * regular skip (1): 'reporters/skips.R:2:3'
+    
+
 ---
 
 

tests/testthat/test-reporter-progress.R

@@ -71,6 +71,11 @@ test_that("display of successes only is compact", {
     test_path("reporters/successes.R")
   )
 
+  expect_snapshot_reporter(
+    CompactProgressReporter$new(),
+    test_path("reporters/skips.R")
+  )
+
   # And even more compact if in RStudio pane
   local_reproducible_output(rstudio = TRUE)
   expect_snapshot_reporter(