fix example and tests

Author: hillalex

R/info.R

@@ -80,7 +80,7 @@ orderly_info <- function(id, name, root = NULL, locate = TRUE) {
 ##' @export
 ##'
 ##' @examples
-##' orderly::orderly_packages()
+##' path <- orderly::orderly_example("minimal")
 ##' orderly::orderly_packages(root = path)
 orderly_packages <- function(root = NULL, locate = TRUE) {
   cfg <- orderly_config(root, locate)

inst/examples/minimal/src/example/orderly.yml

@@ -6,3 +6,4 @@ artefacts:
   staticgraph:
     description: A graph of things
     filenames: mygraph.png
+

inst/examples/minimal/src/example2/orderly.yml

@@ -0,0 +1,10 @@
+data:
+  dat:
+    query: SELECT name, number FROM thing
+script: script.R
+artefacts:
+  staticgraph:
+    description: A graph of things
+    filenames: mygraph.png
+packages:
+  - withr

inst/examples/minimal/src/example2/script.R

@@ -0,0 +1,4 @@
+png("mygraph.png")
+par(mar = c(15, 4, .5, .5))
+barplot(setNames(dat$number, dat$name), las = 2)
+dev.off()

man/orderly_packages.Rd

@@ -4,7 +4,7 @@ test_that("cleanup nothing", {
   path <- test_prepare_orderly_example("minimal")
   out <- capture_logs(orderly_cleanup(root = path))
   expect_null(out$result)
-  expect_equal(orderly_list(root = path), "example")
+  expect_equal(orderly_list(root = path), c("example", "example2"))
   expect_match(out$messages, "Found 0 draft reports", all = FALSE)
   expect_match(out$messages, "Found 0 csv files", all = FALSE)
   expect_match(out$messages, "Found 0 rds files", all = FALSE)

tests/testthat/test-cleanup.R

@@ -15,7 +15,7 @@ test_that("run", {
   expect_identical(res$target, main_do_run)
 
   capture.output(res$target(res))
-  expect_equal(orderly_list(path), "example")
+  expect_equal(orderly_list(path), c("example", "example2"))
   expect_equal(nrow(orderly_list_archive(path)), 1)
 })
 
@@ -36,7 +36,7 @@ test_that("run: id-file", {
   expect_identical(res$target, main_do_run)
 
   capture.output(res$target(res))
-  expect_equal(orderly_list(path), "example")
+  expect_equal(orderly_list(path), c("example", "example2"))
 
   expect_true(file.exists(id_file))
   id <- readLines(id_file)
@@ -302,7 +302,7 @@ test_that("list", {
   args <- c("--root", path, "list")
   res <- cli_args_process(args)
 
-  expect_output(res$target(res), "^example$")
+  expect_output(res$target(res), "^example\\nexample2$")
 
   for (i in c("names", "drafts", "archive")) {
     expect_equal(
@@ -420,7 +420,7 @@ test_that("list", {
   orderly_commit(id2, root = path)
 
   res <- cli_args_process(c("--root", path, "list", "names"))
-  expect_equal(capture.output(res$target(res)), "example")
+  expect_equal(capture.output(res$target(res)), c("example", "example2"))
 
   res <- cli_args_process(c("--root", path, "list", "drafts"))
   out1 <- capture.output(res$target(res))
@@ -697,7 +697,7 @@ test_that("run can save workflow metadata", {
   expect_equal(res$options$workflow_id, "123")
 
   capture.output(res$target(res))
-  expect_equal(orderly_list(path), "example")
+  expect_equal(orderly_list(path), c("example", "example2"))
   expect_equal(nrow(orderly_list_archive(path)), 1)
   id <- orderly_list_archive(path)$id
   rds <- path_orderly_run_rds(file.path(path, "archive", "example", id))

tests/testthat/test-main.R

@@ -15,13 +15,13 @@ test_that("empty", {
 
 test_that("non-empty", {
   path <- test_prepare_orderly_example("minimal")
-  expect_equal(orderly_list(path), "example")
+  expect_equal(orderly_list(path), c("example", "example2"))
 })
 
 test_that("query through lifecycle", {
   skip_on_cran_windows()
   path <- test_prepare_orderly_example("minimal")
-  expect_equal(orderly_list(root = path), "example")
+  expect_equal(orderly_list(root = path), c("example", "example2"))
 
   empty <- data.frame(name = character(0), id = character(0),
                       stringsAsFactors = FALSE)