Merge branch 'main' into 188_cli_wrapper_exts

Author: cderv

DESCRIPTION

@@ -29,7 +29,9 @@ Imports:
     utils,
     yaml
 Suggests: 
+    callr,
     curl,
+    dplyr,
     flextable,
     ggiraph,
     ggplot2,
@@ -38,6 +40,7 @@ Suggests:
     knitr,
     palmerpenguins,
     patchwork,
+    pkgload,
     plotly,
     rsconnect (>= 0.8.26),
     testthat (>= 3.1.7),

tests/testthat/helper.R

@@ -91,7 +91,13 @@ local_quarto_project <- function(
   return(file.path(path_tmp, name))
 }
 
-.render <- function(input, output_file = NULL, ..., .env = parent.frame()) {
+.render <- function(
+  input,
+  output_file = NULL,
+  ...,
+  .quiet = TRUE,
+  .env = parent.frame()
+) {
   skip_if_no_quarto()
   skip_if_not_installed("withr")
   # work inside input directory
@@ -102,7 +108,12 @@ local_quarto_project <- function(
       .local_envir = .env
     ))
   }
-  quarto_render(basename(input), output_file = output_file, quiet = TRUE, ...)
+  expect_no_error(quarto_render(
+    basename(input),
+    output_file = output_file,
+    quiet = .quiet,
+    ...
+  ))
   expect_true(file.exists(output_file))
   normalizePath(output_file)
 }
@@ -240,3 +251,34 @@ local_quarto_run_echo_cmd <- function(.env = parent.frame()) {
     withr::local_options(quarto.echo_cmd = TRUE, .local_envir = .env)
   }
 }
+
+quick_install <- function(package, lib, quiet = TRUE) {
+  skip_if_not_installed("callr")
+  opts <- c(
+    "--data-compress=none",
+    "--no-byte-compile",
+    "--no-data",
+    "--no-demo",
+    "--no-docs",
+    "--no-help",
+    "--no-html",
+    "--no-libs",
+    "--use-vanilla",
+    sprintf("--library=%s", lib),
+    package
+  )
+  invisible(callr::rcmd("INSTALL", opts, show = !quiet, fail_on_status = TRUE))
+}
+
+install_dev_package <- function(.local_envir = parent.frame()) {
+  # if not inside of R CMD check, install dev version into temp directory
+  if (Sys.getenv("_R_CHECK_TIMINGS_") == "") {
+    skip_if_not_installed("pkgload")
+    withr::local_temp_libpaths(.local_envir = .local_envir)
+    quick_install(pkgload::pkg_path("."), lib = .libPaths()[1])
+    withr::local_envvar(
+      R_LIBS = paste0(.libPaths(), collapse = .Platform$path.sep),
+      .local_envir = .local_envir
+    )
+  }
+}

tests/testthat/test-theme.R

@@ -1,46 +1,31 @@
+# don't run on CRAN - this require installed Quarto version with the right version of the quarto package.
+skip_on_cran()
+skip_if_no_quarto()
+skip_if_not_installed("withr")
+
+# We need to install the package in a temporary library when we are in dev mode
+install_dev_package()
+
 test_that("render flextable", {
-  skip_if_no_quarto()
-  quarto_render("theme/flextable.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/flextable.html"))
-  unlink("theme/flextable.html")
+  .render(test_path("theme/flextable.qmd"))
 })
 
-
 test_that("render ggiraph", {
-  skip_if_no_quarto()
-  quarto_render("theme/ggiraph.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/ggiraph.html"))
-  unlink("theme/ggiraph.html")
+  .render(test_path("theme/ggiraph.qmd"))
 })
 
-
 test_that("render ggplot", {
-  skip_if_no_quarto()
-  quarto_render("theme/ggplot.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/ggplot.html"))
-  unlink("theme/ggplot.html")
+  .render(test_path("theme/ggplot.qmd"))
 })
 
-
 test_that("render gt", {
-  skip_if_no_quarto()
-  quarto_render("theme/gt.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/gt.html"))
-  unlink("theme/gt.html")
+  .render(test_path("theme/gt.qmd"))
 })
 
-
 test_that("render plotly-r", {
-  skip_if_no_quarto()
-  quarto_render("theme/plotly-r.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/plotly-r.html"))
-  unlink("theme/plotly-r.html")
+  .render(test_path("theme/plotly-r.qmd"))
 })
 
-
 test_that("render thematic", {
-  skip_if_no_quarto()
-  quarto_render("theme/thematic.qmd", quiet = TRUE)
-  expect_true(file.exists("theme/thematic.html"))
-  unlink("theme/thematic.html")
+  .render(test_path("theme/thematic.qmd"))
 })