Merge 1b4e601 into 57c93d4

R/load.r

@@ -53,6 +53,8 @@
 #' @param pkg package description, can be path or package name.  See
 #'   \code{\link{as.package}} for more information. If the \code{DESCRIPTION}
 #'   file does not exist, it is created using \code{\link{create_description}}.
+#'   (This means that only the precise path to the package, but not to a
+#'   subdirectory in the package, are accepted here.)
 #' @param reset clear package environment and reset file cache before loading
 #'   any pieces of the package. This is equivalent to running
 #'   \code{\link{unload}} and is the default. Use \code{reset = FALSE} may be

tests/testthat/test-load.r

@@ -0,0 +1,10 @@
+context("Loading")
+
+test_that("Package root is working directory when loading", {
+  expect_message(load_all("testLoadDir"), "[|].*/testLoadDir[|]")
+})
+
+test_that("Loading a package subdirectory throws an error", {
+  expect_error(load_all(file.path("testLoadDir", "R")),
+               "does not look like a package")
+})

tests/testthat/test-package.R

@@ -2,9 +2,9 @@ context('package')
 
 test_that("it can load from outside of package root", {
   expect_false('testHooks' %in% loadedNamespaces())
-  load_all(file.path("testHooks", "R"))
+  load_all(file.path("testHooks"))
   expect_true('testHooks' %in% loadedNamespaces())
-  unload(file.path("testHooks", "R"))
+  unload(file.path("testHooks"))
   expect_false('testHooks' %in% loadedNamespaces())
 })