Merge pull request #121 from plietar/who-gives-a-fuck-about-an-oxford…

…-comma

Fix CI issue caused by new cli and outpack versions.

R/outpack_root.R

@@ -174,9 +174,8 @@ validate_packet_has_file <- function(root, id, path, call = NULL) {
     }
   }
 
-  vmsg <- cli::cli_vec(squote(msg), list("vec-last" = " or "))
   err <- paste("Packet '{id}' does not contain the requested",
-               "{cli::qty(vmsg)} path{?s} {vmsg}")
+               "{cli::qty(msg)} path{?s} {.path {msg}}")
   cli::cli_abort(c(err, set_names(hint, "i")), call = call)
 }
 

tests/testthat/helper-outpack-server.R

@@ -1,9 +1,9 @@
 outpack_server <- function(path, timeout = 10) {
-  outpack_server <- Sys.which("outpack_server")
+  outpack_server <- Sys.which("outpack")
   if (!nzchar(outpack_server)) {
     testthat::skip("outpack_server not installed")
   }
-  args <- c("--root", path)
+  args <- c("start-server", "--root", path)
   px <- processx::process$new(outpack_server, args)
   withr::defer_parent(px$kill())
 

tests/testthat/test-outpack-helpers.R

@@ -150,7 +150,7 @@ test_that("good error message if file not found in packet", {
 
   err <- expect_error(
     validate_packet_has_file(root, id, c("a.txt", "a.TXT", "d.txt")),
-    "Packet '.+' does not contain the requested paths\\s*'a.TXT' or 'd.txt'")
+    "Packet '.+' does not contain the requested paths\\s*'a.TXT' and 'd.txt'")
   expect_equal(
     err$body,
     c(i = "For 'a.TXT' did you mean 'a.txt'",