not log for test with mock

hoxo-m · Aug 7, 2016 · be2edcd · be2edcd
1 parent b89f814
commit be2edcd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/R/gh_install_packages.R b/R/gh_install_packages.R
@@ -25,7 +25,6 @@
 #' githubinstall("AnomalyDetection")
 #' }
 #'
-#' @importFrom devtools install_github
 #'
 #' @rdname githubinstall
 #'
@@ -73,10 +72,9 @@ gh_install_packages <- function(packages, ask = TRUE, ref = "master",
   for (i in seq_along(repos)) {
     repo <- repos[i]
     ref <- references[i]
-    results[[i]] <- install_github(repo = repo, ref = ref, quiet = quiet, 
-                             dependencies = dependencies, 
-                             build_vignettes = build_vignettes, ... = ...)
-    log_installed_packages(repos = repo, ref = ref)
+    results[[i]] <- install_package(repo = repo, ref = ref, quiet = quiet, 
+                                    dependencies = dependencies, 
+                                    build_vignettes = build_vignettes, ... = ...)
   }
   .libPaths(lib_paths)
   names(results) <- repos
@@ -87,6 +85,15 @@ gh_install_packages <- function(packages, ask = TRUE, ref = "master",
   }
 }
 
+#' @importFrom devtools install_github
+install_package <- function() {
+  result <- install_github(repo = repo, ref = ref, quiet = quiet, 
+                           dependencies = dependencies, 
+                           build_vignettes = build_vignettes, ... = ...)
+  log_installed_packages(repos = repo, ref = ref)
+  result
+}
+
 select_dependencies <- function(ask, build_vignettes, dependencies, quiet) {
   if (build_vignettes && is.na(dependencies)) {
     msg <- "We recommend to specify the 'dependencies' argument when 'build_vignettes' is TRUE."

diff --git a/tests/testthat/test-gh_install_packages.R b/tests/testthat/test-gh_install_packages.R
@@ -1,13 +1,13 @@
 context("Install packages")
 
-install_github_mock <- function(...) {
+install_package_mock <- function(...) {
   list(...)
 }
 
 test_that("Install a single package", {
   repo <- "AnomalyDetection"
   with_mock(
-    `devtools::install_github` = install_github_mock, 
+    `githubinstall:::install_package` = install_package_mock, 
     act <- gh_install_packages(repo, ask = FALSE)
   )
   expect_equal(act$repo, "twitter/AnomalyDetection")
@@ -16,7 +16,7 @@ test_that("Install a single package", {
 test_that("Install two package", {
   repo <- c("AnomalyDetection", "toybayesopt")
   with_mock(
-    `devtools::install_github` = install_github_mock, 
+    `githubinstall:::install_package` = install_package_mock, 
     act <- gh_install_packages(repo, ask = FALSE)
   )
   expect_equal(length(act), 2)