Don't reuse existing name

r-lib · Feb 11, 2014 · 8339169 · 8339169
1 parent ce34587
commit 8339169
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/test.r b/R/test.r
@@ -17,7 +17,7 @@ test <- function(pkg = ".", filter = NULL, fresh = FALSE) {
   check_testthat()
   pkg <- as.package(pkg)
 
-  if (!has_tests(pkg) && interactive()) {
+  if (!uses_testthat(pkg) && interactive()) {
     message("No testing infrastructure found. Create it?")
     if (menu(c("Yes", "No")) == 1) {
       add_test_infrastructure(pkg)
@@ -83,7 +83,7 @@ devtest <- function(package) {
   path
 }
 
-has_tests <- function(pkg = ".") {
+uses_testthat <- function(pkg = ".") {
   pkg <- as.package(pkg)
 
   paths <- c(
@@ -108,7 +108,7 @@ add_test_infrastructure <- function(pkg = ".") {
   pkg <- as.package(pkg)
 
   check_testthat()
-  if (has_tests(pkg)) {
+  if (uses_testthat(pkg)) {
     stop("Package already has testing infrastructure", call. = FALSE)
   }
 

diff --git a/man/has_tests.Rd b/man/has_tests.Rd
@@ -2,7 +2,7 @@
 \alias{has_tests}
 \title{Was devtools installed with tests?}
 \usage{
-has_tests(pkg = ".")
+has_tests()
 }
 \description{
 Was devtools installed with tests?