Improved various tests.

- Added extra test for excluding ..* in listings.
- Fixed tests for uploading directly from the staging directory.

tests/testthat/test-list.R

@@ -51,6 +51,11 @@ test_that("listFiles works as expected", {
     rfiles <- sort(listFiles("test", "list", "v1", registry=info$registry, url=info$url, forceRemote=TRUE))
     expect_identical(files, rfiles)
 
+    files <- sort(listFiles("test", "list", "v1", registry=info$registry, url=info$url, include..=FALSE))
+    expect_identical(files, sort(c("foo", "whee/blah", "whee2")))
+    rfiles <- sort(listFiles("test", "list", "v1", registry=info$registry, url=info$url, include..=FALSE, forceRemote=TRUE))
+    expect_identical(files, rfiles)
+
     files <- sort(listFiles("test", "list", "v1", registry=info$registry, url=info$url, prefix="whee"))
     expect_identical(files, sort(c("whee/blah", "whee2")))
     rfiles <- sort(listFiles("test", "list", "v1", registry=info$registry, url=info$url, forceRemote=TRUE, prefix="whee"))

tests/testthat/test-upload.R

@@ -66,9 +66,9 @@ test_that("upload works as expected for links", {
     expect_null(man[["whee"]]$link)
 })
 
-test_that("upload works as expected for new versions", {
+test_that("upload works directly from the staging directory", {
     dir <- allocateUploadDirectory(info$staging)
-    write(file=file.path(dir, "blah.txt"), LETTERS)
+    write(file=file.path(dir, "blah.txt"), letters)
     dir.create(file.path(dir, "foo"))
     write(file=file.path(dir, "foo", "bar.txt"), 1:10)
 
@@ -81,6 +81,8 @@ test_that("upload works as expected for new versions", {
         url=info$url
     )
 
-    man <- fetchManifest("test-upload", "jennifer", "1", registry=info$registry)
+    man <- fetchManifest("test-upload", "jennifer", "3", registry=info$registry)
     expect_identical(sort(names(man)), c("blah.txt", "foo/bar.txt"))
+    expect_null(man[["blah.txt"]]$link)
+    expect_false(is.null(man[["foo/bar.txt"]]$link))
 })