Merge remote-tracking branch 'origin/skip-r' into skip-r

Author: MichaelChirico

R/expect-self-test.R

@@ -94,6 +94,9 @@ expect_no_failure <- function(expr) {
 expect_snapshot_skip <- function(x, cran = FALSE) {
   expect_snapshot_error(x, class = "skip", cran = cran)
 }
+expect_skip <- function(code) {
+  expect_condition(code, class = "skip")
+}
 expect_no_skip <- function(code) {
   expect_no_condition(code, class = "skip")
 }

R/skip.R

@@ -133,7 +133,7 @@ package_version <- function(x) {
 skip_unless_r <- function(spec) {
   parts <- unlist(strsplit(spec, " ", fixed = TRUE))
   if (length(parts) != 2L) {
-    abort("`spec` should be a comparison like '>=' and an R version.")
+    cli::cli_abort("{.arg spec} should be a comparison like '>=' and an R version separated by a space.")
   }
   comparator <- match.fun(parts[1L])
   required_version <- numeric_version(parts[2L])
@@ -142,7 +142,7 @@ skip_unless_r <- function(spec) {
   skip_if_not(
     comparator(current_version, required_version),
     sprintf(
-      "Version requirement not satisfied: %s %s %s",
+      "R version requirement not satisfied: %s %s %s",
       current_version, parts[1L], required_version
     )
   )