use .render in test to clean correctly

Author: cderv

tests/testthat/helpers.R

@@ -115,8 +115,6 @@ local_quarto_project <- function(
       "--output",
       output_file_forced
     )
-  } else {
-    NULL
   }
   expect_no_error(quarto_render(
     basename(input),
@@ -126,6 +124,12 @@ local_quarto_project <- function(
     ...
   ))
   out <- output_file %||% output_file_forced
+  withr::defer(
+    if (file.exists(out)) {
+      unlink(out)
+    },
+    envir = .env
+  )
   expect_true(file.exists(out))
   normalizePath(out)
 }
@@ -317,7 +321,7 @@ local_clean_state <- function(env = parent.frame()) {
   )
 }
 
-local_clean_dot_quarto <- function(where = ".", env = parent.frame()) {
+local_clean_dot_quarto <- function(where = ".", .env = parent.frame()) {
   skip_if_not_installed("withr")
   skip_if_not_installed("fs")
   withr::defer(
@@ -328,7 +332,7 @@ local_clean_dot_quarto <- function(where = ".", env = parent.frame()) {
         fs::dir_delete(dot_quarto)
       }
     },
-    envir = env
+    envir = .env
   )
 }
 

tests/testthat/test-theme.R

@@ -16,10 +16,10 @@ resource_dir <- function(input) {
   )
 }
 
-local_render_theme_file <- function(input, env = parent.frame()) {
+local_render_theme_file <- function(input, .env = parent.frame()) {
   skip_if_not_installed("withr")
   skip_if_not_installed("fs")
-  local_clean_dot_quarto(where = dirname(input), env = env)
+  local_clean_dot_quarto(where = dirname(input), .env = .env)
   withr::defer(
     {
       # clean up output resource directory
@@ -28,54 +28,49 @@ local_render_theme_file <- function(input, env = parent.frame()) {
         fs::dir_delete(out_dir)
       }
     },
-    envir = env
+    envir = .env
   )
+  .render(input, .env = .env)
 }
 
 test_that("render flextable", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("flextable")
   file <- theme_file("flextable.qmd")
   local_render_theme_file(file)
-  .render(file)
 })
 
 test_that("render ggiraph", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("ggiraph")
   file <- theme_file("ggiraph.qmd")
   local_render_theme_file(file)
-  .render(file)
 })
 
 test_that("render ggplot2", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("ggplot2")
   file <- theme_file("ggplot2.qmd")
   local_render_theme_file(file)
-  .render(test_path(file))
 })
 
 test_that("render gt", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("gt")
   file <- theme_file("gt.qmd")
   local_render_theme_file(file)
-  .render(file)
 })
 
 test_that("render plotly-r", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("plotly")
   file <- theme_file("plotly-r.qmd")
   local_render_theme_file(file)
-  .render(file)
 })
 
 test_that("render thematic", {
   skip_if_not_installed("bslib")
   skip_if_not_installed("thematic")
   file <- theme_file("thematic.qmd")
   local_render_theme_file(file)
-  .render(file)
 })

tests/testthat/test-utils-extract.R

@@ -34,11 +34,11 @@ test_that("qmd_to_r_script() writes R file that renders", {
   skip_if_no_quarto("1.4.511")
   announce_snapshot_file(name = "purl.md")
   md_file <- xfun::with_ext(r_script, "md")
-  quarto::quarto_render(
+  .render(
     r_script,
-    output_format = "markdown",
     output_file = basename(md_file),
-    quiet = TRUE
+    output_format = "markdown",
+    .quiet = TRUE
   )
   expect_snapshot_file(
     path = md_file,