Remove encoding argument from call to testthat::test_dir

Newer versions of testthat deprecate this argument, so we should no longer use it in the call. Fixes #1776
r-lib · Jul 17, 2018 · 99178f3 · 99178f3
1 parent cb1df84
commit 99178f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # devtools 1.13.3.9000
 
+* `test()` no longer passes encoding argument to `testthat::test_dir()` (#1776)
+
 * `install_url()` can now install package binaries on windows (#1765)
 
 * Fix skipping when installing from a full SHA (#1624)

diff --git a/R/test.r b/R/test.r
@@ -65,10 +65,7 @@ test <- function(pkg = ".", filter = NULL, ...) {
   if (packageVersion("testthat") >= "1.0.2.9000") { # 2.0.0
     testthat_args <- c(testthat_args, load_helpers = FALSE)
   } else if (packageVersion("testthat") > "1.0.2") {
-    testthat_args <- c(testthat_args,
-      load_helpers = FALSE,
-      encoding = pkg$encoding %||% "unknown"
-    )
+    testthat_args <- c(testthat_args, load_helpers = FALSE)
   }
 
   withr::with_envvar(r_env_vars(),