Merge pull request #701 from lorenzwalthert/preprare-parallel

- Prepare for multi-file in and output (#701).

Author: lorenzwalthert

R/testing-public-api.R

@@ -1,10 +1,11 @@
 #' Capture and post-process the output of `style_file` without causing side
 #' effects
 #'
-#' @param file_in A vector passed to [testthat_file()] to construct the path
+#' @param file_in A vector with paths relative to `tests/testthat` the path
 #'   to the reference file.
 #' @return
-#' A character vector with the captured output of [style_file()] called on
+#' A list. Each element is a character vector with the captured output of
+#' [style_file()] called on
 #' `file_in` ran in a temp dir to avoid side effects on the input file (because
 #' the next time the test would ran, the file would not need styling). The
 #' styling is carried out with a temporary working directory change to keep
@@ -16,13 +17,8 @@
 #' how many characters the path of the temporary directory has.
 #' @importFrom utils capture.output
 #' @keywords internal
-catch_style_file_output <- function(file_in = c(
-                                      "public-api",
-                                      "xyzdir-dirty",
-                                      "dirty-sample-with-scope-tokens.R"
-                                    ),
-                                    encoding) {
-  file_in <- do.call(testthat_file, as.list(file_in))
+catch_style_file_output <- function(file_in) {
+  file_in <- testthat_file(file_in)
   temp_path <- copy_to_tempdir(file_in)
   raw_output <- withr::with_dir(
     dirname(temp_path),

man/catch_style_file_output.Rd

@@ -153,11 +153,11 @@ test_that("messages (via cat()) of style_file are correct", {
       list(cli.unicode = encoding == "utf8"),
       {
         # Message if scope > line_breaks and code changes
-        output <- catch_style_file_output(c(
+        output <- catch_style_file_output(file.path(
           "public-api",
           "xyzdir-dirty",
           "dirty-sample-with-scope-tokens.R"
-        ), encoding = encoding)
+        ))
         expect_known_value(
           output,
           testthat_file(paste0(
@@ -168,9 +168,9 @@ test_that("messages (via cat()) of style_file are correct", {
         )
 
         # No message if scope > line_breaks and code does not change
-        output <- catch_style_file_output(c(
+        output <- catch_style_file_output(file.path(
           "public-api", "xyzdir-dirty", "clean-sample-with-scope-tokens.R"
-        ), encoding = encoding)
+        ))
         expect_known_value(
           output,
           testthat_file(paste0(
@@ -181,9 +181,9 @@ test_that("messages (via cat()) of style_file are correct", {
         )
 
         # No message if scope <= line_breaks even if code is changed.
-        output <- catch_style_file_output(c(
+        output <- catch_style_file_output(file.path(
           "public-api", "xyzdir-dirty", "dirty-sample-with-scope-spaces.R"
-        ), encoding = encoding)
+        ))
         expect_known_value(
           output,
           testthat_file(paste0(
@@ -198,17 +198,15 @@ test_that("messages (via cat()) of style_file are correct", {
 })
 
 test_that("Messages can be suppressed", {
-  for (encoding in ls_testable_encodings()) {
     withr::with_options(
-      list(cli.unicode = encoding == "utf8", styler.quiet = TRUE),
+      list(styler.quiet = TRUE),
       {
-        output <- catch_style_file_output(c(
+        output <- catch_style_file_output(file.path(
           "public-api", "xyzdir-dirty", "dirty-sample-with-scope-spaces.R"
-        ), encoding = encoding)
+        ))
         expect_equal(output, character(0))
       }
     )
-  }
 })
 
 context("public API - Rmd in style_dir()")