Make test_file() and test_coverage_file() defunct

NEWS.md

@@ -9,6 +9,7 @@
 * `load_all()` now errors if called recursively, i.e. if you accidentally include a `load_all()` call in one of your R source files (#2617).
 * `release()` is deprecated in favour of `usethis::use_release_issue()`.
 * `show_news()` now looks for NEWS files in the same locations as `utils::news()`: `inst/NEWS.Rd`, `NEWS.md`, `NEWS`, and `inst/NEWS` (@arcresu, #2499).
+* `test_file()` and `test_coverage_file()` are now defunct. These were deprecated in devtools 2.4.0 in favour of `test_active_file()` and `test_coverage_active_file()`. Removing `test_file()` eliminates the conflict with `testthat::test_file()`.
 
 # devtools 2.4.6
 

R/test.R

@@ -54,13 +54,6 @@ test <- function(
   )
 }
 
-#' @rdname devtools-deprecated
-#' @export
-test_file <- function(file = find_active_file(), ...) {
-  lifecycle::deprecate_soft("2.4.0", "test_file()", "test_active_file()")
-  test_active_file(file, ...)
-}
-
 #' @export
 #' @rdname test
 test_active_file <- function(file = find_active_file(), ...) {
@@ -115,17 +108,6 @@ test_coverage <- function(pkg = ".", show_report = interactive(), ...) {
   invisible(coverage)
 }
 
-#' @rdname devtools-deprecated
-#' @export
-test_coverage_file <- function(file = find_active_file(), ...) {
-  lifecycle::deprecate_soft(
-    "2.4.0",
-    "test_coverage()",
-    "test_coverage_active_file()"
-  )
-  test_coverage_active_file(file, ...)
-}
-
 #' @rdname test
 #' @export
 test_coverage_active_file <- function(
@@ -205,3 +187,28 @@ uses_testthat <- function(pkg = ".") {
 
   any(dir_exists(paths))
 }
+
+
+#' Deprecated functions
+#'
+#' These functions are Deprecated in this release of devtools, they will be
+#' marked as Defunct and removed in a future version.
+#' @name devtools-deprecated
+#' @keywords internal
+NULL
+
+#' @rdname devtools-deprecated
+#' @export
+test_file <- function(file = find_active_file(), ...) {
+  lifecycle::deprecate_stop("2.4.0", "test_file()", "test_active_file()")
+}
+
+#' @rdname devtools-deprecated
+#' @export
+test_coverage_file <- function(file = find_active_file(), ...) {
+  lifecycle::deprecate_stop(
+    "2.4.0",
+    "test_coverage_file()",
+    "test_coverage_active_file()"
+  )
+}

R/zzz.R

@@ -5,14 +5,6 @@
 #' @import fs
 NULL
 
-#' Deprecated functions
-#'
-#' These functions are Deprecated in this release of devtools, they will be
-#' marked as Defunct and removed in a future version.
-#' @name devtools-deprecated
-#' @keywords internal
-NULL
-
 devtools_default_options <- list(
   devtools.path = "~/R-dev",
   devtools.install.args = "",