test fixups

Author: kevinushey

R/renvignore.R

@@ -154,8 +154,9 @@ renv_renvignore_parse_impl <- function(entries, prefix = "") {
   # prepend prefix
   entries <- sprintf("^\\Q%s/\\E%s", prefix, entries)
 
-  # remove \\Q\\E
+  # remove \\Q\\E, \\E\\Q
   entries <- gsub("\\Q\\E", "", entries, fixed = TRUE)
+  entries <- gsub("\\E\\Q", "", entries, fixed = TRUE)
 
   # all done!
   entries

tests/testthat/test-renvignore.R

@@ -20,7 +20,7 @@ test_that(".renvignore ignores files, directories", {
   expect_setequal(deps$Package, "oatmeal")
 
   deps <- dependencies("scripts", root = getwd())
-  expect_true(NROW(deps) == 0)
+  expect_true(NROW(deps) == 0L)
 
 })
 
@@ -35,30 +35,30 @@ test_that("ignore patterns are constructed correctly", {
   # ignore data directory at root of project
   expect_equal(
     renv_renvignore_parse_impl("/data", "/project"),
-    "^\\Q/project/\\E\\Qdata\\E(?:/)?$"
+    "^\\Q/project/data\\E(?:/)?$"
   )
 
   # multiple ignores are parsed separately
   expect_equal(
     renv_renvignore_parse_impl(c("/data1", "/data2"), "/project"),
     c(
-      "^\\Q/project/\\E\\Qdata1\\E(?:/)?$",
-      "^\\Q/project/\\E\\Qdata2\\E(?:/)?$"
+      "^\\Q/project/data1\\E(?:/)?$",
+      "^\\Q/project/data2\\E(?:/)?$"
     )
   )
 
   # sub-directory ignores are handled
   expect_equal(
     renv_renvignore_parse_impl("data/internal", "/project"),
-    "^\\Q/project/\\E\\Qdata/internal\\E(?:/)?$"
+    "^\\Q/project/data/internal\\E(?:/)?$"
   )
 
   # negations are handled
   expect_equal(
     renv_renvignore_parse(c("abc.R", "!def.R")),
     list(
       exclude = "^\\Q/\\E(?:.*/)?\\Qabc.R\\E(?:/)?$",
-      include = "^\\Q/\\E\\Qdef.R\\E(?:/)?$"
+      include = "^\\Q/\\E(?:.*/)?\\Qdef.R\\E(?:/)?$"
     )
   )