merge with main

.gitignore

@@ -14,6 +14,7 @@ inst/doc
 revdep/
 !revdep/*.md
 !revdep/problems.md
+tests/testthat/*/*-in_tree
 touchstone/*
 !touchstone/config.json
 !touchstone/script.R

R/set-assert-args.R

@@ -1,19 +1,3 @@
-#' Set the write_tree argument
-#'
-#' Sets the argument `write_tree` in [test_collection()] to be `TRUE` for R
-#' versions higher or equal to 3.2, and `FALSE` otherwise since the second-level
-#' dependency `DiagrammeR` from `data.tree` is not available for R < 3.2.
-#' @param write_tree Whether or not to write tree.
-#' @keywords internal
-set_arg_write_tree <- function(write_tree) {
-  if (is.na(write_tree)) {
-    write_tree <- is_installed("data.tree")
-  } else if (write_tree) {
-    check_installed("data.tree")
-  }
-  write_tree
-}
-
 #' Assert the transformers
 #'
 #' Actually only assert name and version of style guide in order to make sure

R/testing.R

@@ -19,7 +19,7 @@
 #' @keywords internal
 test_collection <- function(test, sub_test = NULL,
                             dry = "off",
-                            write_tree = NA,
+                            write_tree = FALSE,
                             transformer,
                             ...) {
   path <- rprojroot::find_testthat_root_file(test)
@@ -93,19 +93,17 @@ construct_tree <- function(in_paths, suffix = "_tree") {
 #' @param out_name The label of the out_item, defaults to `out_item`.
 #' @param transformer A function to apply to the content of `in_item`.
 #' @param write_tree Whether or not the tree structure of the test should be
-#'   computed and written to a file. Note that this needs R >= 3.2
-#'   (see [set_arg_write_tree()]). If the argument is set to `NA`, the function
-#'   determines whether R >= 3.2 is in use and if so, trees will be written.
+#'   computed and written to a files.
 #' @param ... Parameters passed to transformer function.
 #' @param out_tree Name of tree file if written out.
 #' @inheritParams transform_utf8
 #' @keywords internal
 transform_and_check <- function(in_item, out_item,
                                 in_name = in_item, out_name = out_item,
                                 transformer, dry,
-                                write_tree = NA,
+                                write_tree = FALSE,
                                 out_tree = "_tree", ...) {
-  write_tree <- set_arg_write_tree(write_tree)
+  if (write_tree) check_installed("data.tree")
   read_in <- read_utf8_bare(in_item)
   if (write_tree) {
     create_tree(read_in) %>%