fixed some path issues in tests

Author: s-fleck

tests/testthat/integration_tests/test_get_pkg_functions.R

@@ -1,7 +1,7 @@
 context("get_package_functions")
 
 
-proj <- usethis::proj_get()
+proj <- rprojroot::find_package_root_file()
 
 test_that('get_pkg_tested_functions_from_desc works', {
   #* @testing get_pkg_tested_functions_from_desc
@@ -16,8 +16,9 @@ test_that('get_pkg_tested_functions_from_desc works', {
     get_pkg_tested_functions_from_desc()
   )
 
-  expect_identical(tres, tfuns[1:4])
+  expect_identical(names(tres[sapply(tres, length) > 0]), tfuns[1:4])
+
   usethis::proj_set(proj)
 })
 
-usethis::proj_set(proj)
+

tests/testthat/integration_tests/test_infrastructure.R

@@ -1,6 +1,6 @@
 context("infrastructure-non cran tests")
 
-proj <- usethis::proj_get()
+proj <- rprojroot::find_package_root_file()
 
 test_that("use_testdata creates testdata dir", {
   #* @testing has_testdata
@@ -154,3 +154,4 @@ test_that("use_test_subdir works as expected", {
   expect_identical(package_state, list.files(".", recursive = TRUE))
   usethis::proj_set(proj)
 })
+

tests/testthat/integration_tests/test_list_test_files.R

@@ -1,6 +1,6 @@
 context("list_test_files")
 
-proj <- usethis::proj_get()
+proj <- rprojroot::find_package_root_file()
 
 test_that("list_test_files works as expected", {
   #* @testing list_test_files

tests/testthat/integration_tests/test_use_testdata.R

@@ -1,24 +1,29 @@
 context("use_testdata")
 
-proj <- usethis::proj_get()
+proj <- rprojroot::find_package_root_file()
 
 
 test_that("saving and loading testdata works", {
   #* @testing read_testdata
   #* @testing use_testdata
 
+  # Check for clean state
   package_state <- list.files(".", recursive = TRUE)
   tpkg <- file.path(rprojroot::find_testthat_root_file("testdata", "test_pkg"))
   usethis::proj_set(tpkg)
   efile <- file.path(tpkg, "tests", "testthat", "testdata", "iris.rds")
 
 
   # Test saving and loading
-  expect_message(use_testdata(iris), "Saving to")
+  expect_output(expect_message(use_testdata(iris), "Saving to"))
   expect_true(file.exists(efile))
   tdat <- read_testdata("iris.rds")
   expect_identical(iris, tdat)
-  unlink(efile)
+
+  unlink(
+    file.path(tpkg, "tests/testthat/testdata"),
+    recursive = TRUE
+  )
 
   # Check if tests did not modify package
   usethis::proj_set(proj)

tests/testthat/integration_tests/test_use_testignore.R

@@ -1,6 +1,6 @@
 context("use_testignore")
 
-proj <- usethis::proj_get()
+proj <- rprojroot::find_package_root_file()
 
 test_that("use_testignore works as expected", {
   fs   <- list.files(".")