switch to third edition for testing

Author: lorenzwalthert

R/exec.R

@@ -32,6 +32,15 @@ path_precommit_exec <- function(check_if_exists = TRUE) {
   final
 }
 
+#' Get the operating System
+#'
+#' Can't mock base package (either because it's an `.Internal` or for some other
+#' reason).
+#' @keywords internal
+get_os <- function() {
+  tolower(Sys.info()[["sysname"]])
+}
+
 #' @rdname path_precommit_exec
 #' @examples
 #' \dontrun{
@@ -56,7 +65,7 @@ path_pre_commit_exec <- function(check_if_exists = TRUE) {
 #' @keywords internal
 path_derive_precommit_exec <- function() {
   path <- path_derive_precommit_exec_path()
-  os <- tolower(Sys.info()[["sysname"]])
+  os <- get_os()
   if (os == "darwin") {
     path <- c(path, path_derive_precommit_exec_macOS())
   } else if (os == "windows") {

man/get_os.Rd

@@ -181,8 +181,9 @@ if (!on_cran()) {
   })
   test_that("can update via conda", {
     if (not_conda()) {
+      local_mocked_bindings(assert_reticulate_is_installed = function(...) NULL)
       expect_error(
-        with_mock(update_precommit(), "precommit:::assert_reticulate_is_installed" = function(...) NULL),
+        update_precommit(),
         paste(
           "You can only update your pre-commit executable via the R API if you",
           "chose the installation method via conda"

tests/testthat/test-conda.R

@@ -1,21 +1,25 @@
-test_that("Path can be derived for windows Python >= 3.0", {
-  paths_base <- with_mock(
-    "precommit::path_derive_precommit_exec_win_python3plus_candidates" = function() {
+test_that("Path can be derived for windows Python >= 3.0 (mocked)", {
+  local_mocked_bindings(
+    path_derive_precommit_exec_win_python3plus_candidates = function() {
       c(
         fs::path_home("AppData/Roaming/Python/Python35"),
         fs::path_home("AppData/Roaming/Python/Python37")
       )
-    },
-    path_derive_precommit_exec_win_python3plus_base()
+    }
   )
 
   expect_equal(
-    paths_base,
+    path_derive_precommit_exec_win_python3plus_base(),
     c(
       fs::path(fs::path_home(), "AppData/Roaming/Python/Python37/Scripts"),
       fs::path(fs::path_home(), "AppData/Roaming/Python/Python35/Scripts")
-    )
+    ),
+    ignore_attr = TRUE
   )
+})
+
+
+test_that("Path can be derived for windows Python >= 3.0 (actual)", {
   skip_if(!is_windows())
   skip_if(!not_conda())
   skip_if(on_cran())
@@ -28,61 +32,63 @@ test_that("Path can be derived for windows Python >= 3.0", {
 
 
 test_that("Warns when there are multiple installations found (2x os)", {
+  local_mocked_bindings(
+    path_derive_precommit_exec_path = function(candidate) {
+      fs::path_home("AppData/Roaming/Python/Python35")
+    },
+    get_os = function(...) {
+      c(sysname = "windows")
+    },
+    path_derive_precommit_exec_win = function() {
+      c(
+        fs::path_home("AppData/Roaming/Python/Python34"),
+        fs::path_home("AppData/Roaming/Python/Python37")
+      )
+    }
+  )
+
   expect_warning(
-    with_mock(
-      "precommit::path_derive_precommit_exec_path" = function(candidate) {
-        fs::path_home("AppData/Roaming/Python/Python35")
-      },
-      "Sys.info" = function(...) {
-        c(sysname = "windows")
-      },
-      "precommit:::path_derive_precommit_exec_win" = function() {
-        c(
-          fs::path_home("AppData/Roaming/Python/Python34"),
-          fs::path_home("AppData/Roaming/Python/Python37")
-        )
-      },
-      path_derive_precommit_exec()
-    ),
+    path_derive_precommit_exec(),
     "We detected multiple pre-commit executables"
   )
 })
 
 test_that("Warns when there are multiple installations found (2x path)", {
+  local_mocked_bindings(
+    path_derive_precommit_exec_path = function(candidate) {
+      c(
+        fs::path_home("AppData/Roaming/Python/Python35"),
+        fs::path_home("AppData/Roaming/Python/Python37")
+      )
+    },
+    get_os = function(...) {
+      c(sysname = "windows")
+    },
+    path_derive_precommit_exec_win = function() {
+      fs::path_home("AppData/Roaming/Python/Python34")
+    }
+  )
   expect_warning(
-    with_mock(
-      "precommit::path_derive_precommit_exec_path" = function(candidate) {
-        c(
-          fs::path_home("AppData/Roaming/Python/Python35"),
-          fs::path_home("AppData/Roaming/Python/Python37")
-        )
-      },
-      "Sys.info" = function(...) {
-        c(sysname = "windows")
-      },
-      "precommit:::path_derive_precommit_exec_win" = function() {
-        fs::path_home("AppData/Roaming/Python/Python34")
-      },
-      path_derive_precommit_exec()
-    ),
+    path_derive_precommit_exec(),
     "We detected multiple pre-commit executables"
   )
 })
 
 test_that("Warns when there are multiple installations found (path and os)", {
+  local_mocked_bindings(
+    path_derive_precommit_exec_path = function(candidate) {
+      fs::path_home("AppData/Roaming/Python/Python35")
+    },
+    path_derive_precommit_exec_win = function() {
+      fs::path_home("AppData/Roaming/Python/Python34")
+    },
+    get_os = function(...) {
+      c(sysname = "windows")
+    },
+  )
+
   expect_warning(
-    with_mock(
-      "precommit::path_derive_precommit_exec_path" = function(candidate) {
-        fs::path_home("AppData/Roaming/Python/Python35")
-      },
-      "Sys.info" = function(...) {
-        c(sysname = "windows")
-      },
-      "precommit:::path_derive_precommit_exec_win" = function() {
-        fs::path_home("AppData/Roaming/Python/Python34")
-      },
-      path_derive_precommit_exec()
-    ),
+    path_derive_precommit_exec(),
     "We detected multiple pre-commit executables"
   )
 })