fix: remove setup name in vignettes

ThinkR-open · May 7, 2024 · 06968e2 · 06968e2
1 parent 763c1c0
commit 06968e2
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 14 deletions.
diff --git a/R/inflate-utils.R b/R/inflate-utils.R
@@ -498,7 +498,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(.{pkgname}.)
 ```
     ',

diff --git a/R/inflate.R b/R/inflate.R
@@ -365,7 +365,9 @@ inflate <- function(pkg = ".", flat_file,
 
 
   # Restart RStudio
-  if (needs_restart) {
+  is_rstudio <- Sys.getenv("RSTUDIO") == "1"
+
+  if (needs_restart & is_rstudio) {
     cli::cat_rule("RStudio restart needed")
     getFromNamespace("restart_rstudio", "usethis")("A restart of RStudio is required to activate the Build pane")
   }

diff --git a/dev/README.md b/dev/README.md
@@ -81,9 +81,9 @@ usethis::with_project(here::here(), {
       - flat\_title
           - dev\_history.Rmd
       - path
-          - dev/flat\_history\_core.Rmd
+          - dev/flat\_history/flat\_history\_core.Rmd
       - state
-          - 🛑 inactive
+          - 🛑 deprecated
       - R
           - R/fill\_description.R
               - 👀 fill\_description

diff --git a/dev/dev_history_cran.R b/dev/dev_history_cran.R
@@ -21,12 +21,18 @@ unlink(skeleton_dir, recursive = TRUE)
 # _Check in interactive test-inflate for templates and Addins ----
 pkgload::load_all()
 
+# /!\ While running these tests manually with `test_file()`,
+# do not do anything else in your IDE /!\
+# Do not change file open, do not change text in the current file, nothing...
+# Unit tests open files interactively and close them
+# The focus needs to be kept on what the test is doing
 Sys.setenv("NOT_CRAN" = "true")
 testthat::test_dir("tests/testthat/")
 testthat::test_file("tests/testthat/test-inflate-part1.R")
 testthat::test_file("tests/testthat/test-inflate-part2.R")
 testthat::test_file("tests/testthat/test-inflate_all.R")
 testthat::test_file("tests/testthat/test-inflate_all_utils.R")
+testthat::test_file("tests/testthat/test-build_fusen_chunks.R") # Opens files
 testthat::test_file("tests/testthat/test-add_flat_template.R")
 testthat::test_file("tests/testthat/test-skeleton.R")
 testthat::test_file("tests/testthat/test-register_config_file.R") # interactivity

diff --git a/dev/flat_get_package_structure.Rmd b/dev/flat_get_package_structure.Rmd
@@ -211,7 +211,7 @@ draw_the_tree <- function(structure_list, silent = FALSE) {
 }
 ```
 
-```{r examples-get_package_structure, eval=FALSE}
+```{r examples-get_package_structure}
 #' \dontrun{
 #' # This only works inside a 'fusen' built package
 #' pkg_structure <- get_package_structure()

diff --git a/inst/rmarkdown/templates/additional/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/additional/skeleton/skeleton.Rmd
@@ -34,7 +34,7 @@ skeleton()
 
 ```{r tests-skeleton}
 test_that("skeleton works", {
-
+  expect_true(inherits(skeleton, "function"))
 })
 ```
 

diff --git a/tests/testthat/test-inflate-part1.R b/tests/testthat/test-inflate-part1.R
@@ -457,7 +457,10 @@ usethis::with_project(dummypackage, {
 usethis::with_project(dummypackage, {
   file.remove(file.path(dummypackage, ".here"))
   file.remove(file.path(dummypackage, ".Rbuildignore"))
-  cat("", file = file.path(dummypackage, "dummy.Rproj"))
+  cat("", file = file.path(
+    dummypackage,
+    paste0(basename(dummypackage), ".Rproj")
+  ))
 
   # Add
   # {fusen} steps

diff --git a/vignettes/deal-with-a-fusen-flat-file.Rmd b/vignettes/deal-with-a-fusen-flat-file.Rmd
@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(fusen)
 ```
 

diff --git a/vignettes/draw-a-map-of-your-package-files-and-functions.Rmd b/vignettes/draw-a-map-of-your-package-files-and-functions.Rmd
@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(fusen)
 ```
 
@@ -40,8 +40,6 @@ You can know:
 With `draw_the_map()`, you can draw a tree of the package structure in the console.
 
 ```{r examples-get_package_structure}
-#| eval: no
-
 #' \dontrun{
 #' # This only works inside a 'fusen' built package
 #' pkg_structure <- get_package_structure()

diff --git a/vignettes/inflate-all-your-flat-files.Rmd b/vignettes/inflate-all-your-flat-files.Rmd
@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(fusen)
 ```
 

diff --git a/vignettes/register-files-in-config.Rmd b/vignettes/register-files-in-config.Rmd
@@ -15,7 +15,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(fusen)
 ```
 

diff --git a/vignettes/share-on-a-github-website.Rmd b/vignettes/share-on-a-github-website.Rmd
@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup}
+```{r}
 library(fusen)
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -498,7 +498,7 @@ knitr::opts_chunk$set( @@
     )
     ```
-    ```{r setup}
+    ```{r}
     library(.{pkgname}.)
     ```
         ',
@@ Expand Down @@