prepare for CRAN release. Many tests now fail with devtools::check() because of issues with usethis::proj_get(). They have been moved to integration tests

Author: s-fleck

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: testthis
 Type: Package
 Title: Utils and 'RStudio' Addins to Make Testing Even More Fun
-Version: 1.0.1.9000
+Version: 1.0.2
 Authors@R: person("Stefan", "Fleck", email = "[email protected]", role = c("aut", "cre"))
 Maintainer: Stefan Fleck <[email protected]>
 Description:

R/test_subdir.R

@@ -44,8 +44,6 @@
 #'
 #' @export
 test_subdir <- function(subdir, ...){
-
-  browser()
   testthat::test_dir(file.path(
     usethis::proj_get(), testthat::test_path(), subdir
   ))

R/use_test_subdir.R

@@ -43,11 +43,8 @@ use_test_subdir <- function(
   assert_that(is.scalar(make_tester))
   assert_that(is.scalar(is.logical(make_tester) || is.character(make_tester)))
 
-
   # Process arguments
   path <- make.names(path)
-  base_path <- usethis::proj_get()
-
 
   # Logic
   usethis::use_directory(
@@ -78,7 +75,6 @@ use_test_subdir <- function(
 #'   to create a tester function.
 #' @param ignore Logical. Add `tester_path` to \file{.Rbuildignore}?
 #' @param tester_path \R script file in which to store the tester functions
-#' @template base_path
 #'
 #' @return `TRUE` on success (invisibly).
 #' @export

R/use_testdata.R

@@ -10,7 +10,6 @@
 #' @inheritParams base::readRDS
 #' @template overwrite
 #' @inheritParams usethis::use_directory
-#' @template base_path
 #' @return `use_testdata()` returns `TRUE` if object was successfully saved.
 #'
 #' @section Side effects:
@@ -36,12 +35,12 @@ use_testdata <- function(
 
 
   # Find and prepare test_data directory
-  base_path <- usethis::proj_get()
+  pkg <- usethis::proj_get()
   tdata_dir <- file.path("tests", "testthat", "testdata")
   if(!is.null(subdir)){
     tdata_dir <- file.path(tdata_dir, subdir)
   }
-  save_path <- file.path(base_path, tdata_dir)
+  save_path <- file.path(pkg, tdata_dir)
 
   show_dir_creation_message <- !dir.exists(save_path)
   usethis::use_directory(tdata_dir, ignore = FALSE)

cran-comments.md

@@ -14,12 +14,8 @@ This is a new release, so there are no reverse dependencies.
 
 ## Notes
 
-* One function of the script uses `:::` for a piece of code where it needs to
-  mock a devtools function. 'testthis' integrates tightly with devtools and
-  this was the cleanest way that I could find to solve that particular problem.
-  
-* Most functions in this package modify the file system or are designed to be
-  run interactively. That is why most code examples in the documentation are
-  wrapped in `\dontrun{}`
+Most functions in this package modify the file system or are designed to be
+run interactively. That is why most code examples in the documentation are
+wrapped in `\dontrun{}`.
 
 ---

man-roxygen/base_path.R

@@ -170,7 +170,7 @@ The test_coverage summary for a package may look like this (+ marks function for
 which tests exist):
 
 ```{r}
-get_test_coverage(base_path = system.file(package = 'testthis'))
+get_test_coverage()
 ```