Send a skip rather than a regression condition

Author: lionel-

R/testthat-ui.R

@@ -199,30 +199,11 @@ case_declare <- function(case, fig_name) {
 }
 
 new_expectation <- function(msg, case, type, vdiffr_type) {
-  exp <- vdiffr_expectation(type, msg)
+  exp <- testthat::expectation(type, msg)
   classes <- c(class(exp), vdiffr_type)
   structure(exp, class = classes, vdiffr_case = case)
 }
 
-# FIXME: Use `testthat::expectation()` once it supports regressions
-vdiffr_expectation <- function(type, message, srcref = NULL) {
-  type <- match.arg(type, c("success", "failure", "error", "regression", "skip", "warning"))
-
-  structure(
-    list(
-      message = message,
-      srcref = srcref
-    ),
-    class = c(
-      paste0("expectation_", type),
-      "expectation",
-      # Make broken expectations catchable by try()
-      if (type %in% c("failure", "error")) "error",
-      "condition"
-    )
-  )
-}
-
 new_exp <- function(msg, case) {
   new_expectation(msg, case, "skip", "vdiffr_new")
 }
@@ -234,11 +215,9 @@ mismatch_exp <- function(msg, case) {
     msg <- "The vdiffr engine is too old. Please update vdiffr and revalidate the figures."
     new_expectation(msg, case, "skip", "vdiffr_mismatch")
   } else if (is_ci()) {
-    # FIXME: Remove this branch once testthat interprets regressions
-    # as failures on CI
     new_expectation(msg, case, "failure", "vdiffr_mismatch")
   } else {
-    new_expectation(msg, case, "regression", "vdiffr_mismatch")
+    new_expectation(msg, case, "skip", "vdiffr_mismatch")
   }
 }
 

tests/testthat/test-expectations.R

@@ -12,7 +12,7 @@ test_that("Mismatches are skipped except on CI and interactively", {
 
   skipped_result <- subset_results(test_results, "test-failed.R", "mismatches are skipped when NOT_CRAN is unset")[[1]]
   expect_match(skipped_result$message, "Figures don't match: myplot.svg\n")
-  expect_is(skipped_result, "expectation_regression")
+  expect_is(skipped_result, "expectation_skip")
 })
 
 test_that("Duplicated expectations issue warning", {