Tweaks from running manual tests on Windows VM

Author: jennybc

tests/manual/manual-create-from-github.R

@@ -1,4 +1,5 @@
-devtools::load_all()
+#devtools::load_all()
+library(usethis)
 library(testthat)
 library(fs)
 

tests/manual/manual-use-course.R

@@ -1,5 +1,6 @@
-devtools::load_all()
+library(usethis)
 library(fs)
+library(testthat)
 
 ## Inspiration for manual tests. Pretty rough.
 
@@ -24,15 +25,15 @@ owd <- setwd(path_temp())
 
 ## destdir = NULL, pedantic = TRUE, target filepath doesn't exist ----
 file_delete("rematch2-master.zip")
-download_zip(gh_url, pedantic = TRUE)
+usethis:::download_zip(gh_url, pedantic = TRUE)
 ## should get "Proceed...?" prompt
 ## no --> aborts
 ## yes --> downloads
 expect_true(file_exists("rematch2-master.zip"))
 
 ## destdir = NULL, target filepath does exist ----
 expect_true(file_exists("rematch2-master.zip"))
-download_zip(gh_url)
+usethis:::download_zip(gh_url)
 ## should get "Overwrite...?" query
 ## no --> aborts
 ## yes --> downloads
@@ -43,48 +44,48 @@ dir_create("a")
 expect_true(file_exists("a"))
 file_delete("a/rematch2-master.zip")
 expect_false(file_exists("a/rematch2-master.zip"))
-download_zip(gh_url, destdir = "a")
+usethis:::download_zip(gh_url, destdir = "a")
 ## should just download
 expect_true(file_exists("a/rematch2-master.zip"))
 
 ## destdir given & exists, target filepath does exist ----
 expect_true(file_exists("a/rematch2-master.zip"))
-download_zip(gh_url, destdir = "a")
+usethis:::download_zip(gh_url, destdir = "a")
 ## should get "Overwrite...?" query
 ## no --> aborts
 ## yes --> downloads
 
 ## destdir given & does not exist ----
 expect_false(file_exists("b"))
-download_zip(gh_url, destdir = "b")
+usethis:::download_zip(gh_url, destdir = "b")
 ## should get error re: Directory does not exist
 
 ## Download from various places ----
 
 ## usethis-test folder JB created for development
 dropbox1 <- "https://www.dropbox.com/sh/0pedgdob30bbbei/AACYL0JyZD6XcpZk_-YmtpgXa?dl=1"
-download_zip(dropbox1, pedantic = FALSE)
+usethis:::download_zip(dropbox1, pedantic = FALSE)
 
 ## an actual workshop folder from Hadley (big and slow)
 dropbox2 <- "https://www.dropbox.com/sh/ofc1gifr77ofej8/AACuBrToN1Yjo_ZxWfrYnEbJa?dl=1"
-download_zip(dropbox2, pedantic = FALSE)
+usethis:::download_zip(dropbox2, pedantic = FALSE)
 
 ## the ZIP URL favored by devtools
 gh_url <- "http://github.com/r-lib/rematch2/zipball/master/"
-download_zip(gh_url, pedantic = FALSE)
+usethis:::download_zip(gh_url, pedantic = FALSE)
 
 ## don't be surprised if asked whether to Overwrite, this may have been
 ## downloaded before, via other means
 bitly <- "http://bit.ly/uusseetthhiiss"
-download_zip(bitly, pedantic = FALSE)
+usethis:::download_zip(bitly, pedantic = FALSE)
 
 # tidy_unzip() ----
 
 ## if they are in wd
-tidy_unzip("17-tidy-tools.zip")
-tidy_unzip("r-lib-rematch2-335a55f.zip")
-tidy_unzip("rematch2-master.zip")
-tidy_unzip("usethis-test.zip")
+usethis:::tidy_unzip("17-tidy-tools.zip")
+usethis:::tidy_unzip("r-lib-rematch2-335a55f.zip")
+usethis:::tidy_unzip("rematch2-master.zip")
+usethis:::tidy_unzip("usethis-test.zip")
 
 ## if they are in ~/tmp
 tidy_unzip("~/tmp/manual/17-tidy-tools.zip")
@@ -93,10 +94,10 @@ tidy_unzip("rematch2-master.zip")
 tidy_unzip("~/tmp/manual/usethis-test.zip")
 
 # one-off test of GitHub vs DropBox
-download_zip("https://github.com/jennybc/yo/archive/master.zip", pedantic = FALSE)
-download_zip("https://www.dropbox.com/sh/afydxe6pkpz8v6m/AADHbMZAaW3IQ8zppH9mjNsga?dl=1", pedantic = FALSE)
+usethis:::download_zip("https://github.com/jennybc/yo/archive/master.zip", pedantic = FALSE)
+usethis:::download_zip("https://www.dropbox.com/sh/afydxe6pkpz8v6m/AADHbMZAaW3IQ8zppH9mjNsga?dl=1", pedantic = FALSE)
 
-tidy_unzip("yo-master.zip")
+usethis:::tidy_unzip("yo-master.zip")
 file_move("yo-master", "yo")
 ## git commit here
 file_delete("yo")

tests/manual/manual-use-github.R

@@ -1,4 +1,5 @@
-devtools::load_all()
+#devtools::load_all()
+library(usethis)
 library(fs)
 
 pkgname <- "klmnop"