Update test-rix.R

ropensci · Sep 18, 2024 · e7e321a · e7e321a
1 parent aee2e42
commit e7e321a
Showing 1 changed file with 68 additions and 54 deletions.
diff --git a/tests/testthat/test-rix.R b/tests/testthat/test-rix.R
@@ -62,7 +62,7 @@ testthat::test_that("rix(), ide is 'other' or 'code'", {
 
   on.exit(
     unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
+    add = TRUE, after = TRUE
   )
 
   save_default_nix_test <- function(ide, path_default_nix) {
@@ -123,6 +123,11 @@ testthat::test_that("Quarto gets added to sys packages", {
 
   path_default_nix <- normalizePath(tempdir())
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(pkgs, interface, path_default_nix) {
     # Because of rix_init, see above
     suppressWarnings(
@@ -161,17 +166,19 @@ testthat::test_that("Quarto gets added to sys packages", {
     name = "yes_quarto_default.nix"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
+
 })
 
 testthat::test_that("If on darwin and ide = rstudio, raise warning", {
   skip_if(Sys.info()["sysname"] != "Darwin")
 
   path_default_nix <- normalizePath(tempdir())
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.3.1",
@@ -190,15 +197,16 @@ testthat::test_that("If on darwin and ide = rstudio, raise warning", {
     regexp = "refer to the macOS"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
 })
 
 testthat::test_that("If R version is 4.4.0, raise warning", {
   path_default_nix <- tempdir()
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.4.0",
@@ -217,15 +225,17 @@ testthat::test_that("If R version is 4.4.0, raise warning", {
     regexp = "version is not available"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
+
 })
 
 testthat::test_that("If R version is <= 4.1.1, raise warning", {
   path_default_nix <- tempdir()
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.1.1",
@@ -244,16 +254,16 @@ testthat::test_that("If R version is <= 4.1.1, raise warning", {
     regexp = "older version of R"
   )
 
-
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
 })
 
 testthat::test_that("If on ide = rstudio, but no R packages, raise error", {
   path_default_nix <- tempdir()
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.3.1",
@@ -272,15 +282,16 @@ testthat::test_that("If on ide = rstudio, but no R packages, raise error", {
     regexp = "didn't add any R packages"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
 })
 
 testthat::test_that("If R version is == 3.5.3, raise warning", {
   path_default_nix <- tempdir()
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "3.5.3",
@@ -299,20 +310,22 @@ testthat::test_that("If R version is == 3.5.3, raise warning", {
     regexp = "older version of R"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
+
 })
 
 testthat::test_that("rix(), bleeding_edge", {
-  skip_on_cran()
+  #skip_on_cran()
   path_default_nix <- paste0(
     tempdir(), paste0(sample(letters, 5), collapse = "")
   )
   dir.create(path_default_nix)
   path_default_nix <- normalizePath(path_default_nix)
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(ide, path_default_nix) {
     # This will generate the warning to read the vignette for bleeding_edge
     suppressWarnings(
@@ -349,14 +362,10 @@ testthat::test_that("rix(), bleeding_edge", {
     name = "bleeding_edge_default.nix",
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
 })
 
 testthat::test_that("rix(), frozen_edge", {
-  skip_on_cran()
+  #skip_on_cran()
   # because of the sed command, this will only work on Linux
   skip_if(Sys.info()["sysname"] != "Linux")
 
@@ -366,6 +375,15 @@ testthat::test_that("rix(), frozen_edge", {
   dir.create(path_default_nix)
   path_default_nix <- normalizePath(path_default_nix)
 
+  on.exit({
+    system(
+      paste0("sed -i 's/", frozen_edge_commit, "/REVISION/' _snaps/rix/frozen_edge_default.nix")
+    )
+    unlink(path_default_nix, recursive = TRUE, force = FALSE)
+  },
+  add = TRUE, after = TRUE
+  ) 
+
   save_default_nix_test <- function(ide, path_default_nix) {
     # This will generate the warning to read the vignette for bleeding_edge
     suppressWarnings(
@@ -408,26 +426,22 @@ testthat::test_that("rix(), frozen_edge", {
     name = "frozen_edge_default.nix",
   )
 
-
-  on.exit({
-    system(
-      paste0("sed -i 's/", frozen_edge_commit, "/REVISION/' _snaps/rix/frozen_edge_default.nix")
-    )
-    unlink(path_default_nix, recursive = TRUE, force = FALSE)
-  },
-  add = TRUE
-  )
 })
 
 
 testthat::test_that("rix(), only one Github package", {
-  skip_on_cran()
+  #skip_on_cran()
   path_default_nix <- paste0(
     tempdir(), paste0(sample(letters, 5), collapse = "")
   )
   dir.create(path_default_nix)
   path_default_nix <- normalizePath(path_default_nix)
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.3.1",
@@ -453,10 +467,6 @@ testthat::test_that("rix(), only one Github package", {
     name = "one_git_default.nix",
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
 })
 
 
@@ -467,6 +477,11 @@ testthat::test_that("rix(), conclusion message", {
   dir.create(path_default_nix)
   path_default_nix <- normalizePath(path_default_nix)
 
+  on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   save_default_nix_test <- function(path_default_nix) {
     rix(
       r_ver = "4.3.1",
@@ -484,10 +499,7 @@ testthat::test_that("rix(), conclusion message", {
     regexp = "Successfully"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
+
 })
 
 
@@ -500,6 +512,11 @@ testthat::test_that("rix(), warning message if rix_init() already called", {
   dir.create(path_default_nix)
   path_default_nix <- normalizePath(path_default_nix)
 
+on.exit(
+    unlink(path_default_nix, recursive = TRUE, force = TRUE),
+    add = TRUE, after = TRUE
+  )
+
   rix_init(
     project_path = path_default_nix,
     rprofile_action = "overwrite",
@@ -532,8 +549,5 @@ testthat::test_that("rix(), warning message if rix_init() already called", {
     regexp = "You may"
   )
 
-  on.exit(
-    unlink(path_default_nix, recursive = TRUE, force = TRUE),
-    add = TRUE
-  )
+
 })