fixes

mrc-ide · Jan 14, 2025 · 2d078a4 · 2d078a4
1 parent 6b3e83a
commit 2d078a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/R/api.R b/R/api.R
@@ -93,7 +93,7 @@ repository_branches <- function(repositories_base_path, url) {
 ##'   query ref :: string
 ##'   state root :: root
 report_list <- function(root, ref) {
-  base <- git_get_default_branch(root)
+  base <- git_remote_default_branch_ref(root)
   reports <- get_reports(root = root, ref = ref, base = base)
 
   data.frame(

diff --git a/tests/testthat/helper-orderly-runner.R b/tests/testthat/helper-orderly-runner.R
@@ -165,16 +165,16 @@ git_add_and_commit <- function(path, add = ".", message = "new commit") {
 }
 
 
-git_add_and_commit <- function(path, add = ".") {
+git_add_and_commit <- function(path, add = ".", message = "new commit") {
   gert::git_add(add, repo = path)
   user <- "author <author@example.com>"
-  gert::git_commit("new commit", author = user, committer = user, repo = path)
+  gert::git_commit(message, author = user, committer = user, repo = path)
 }
 
 
-create_new_commit <- function(path, new_file = "new", add = ".") {
+create_new_commit <- function(path, new_file = "new", add = ".", ...) {
   writeLines(ids::random_id(), file.path(path, new_file))
-  git_add_and_commit(path, add)
+  git_add_and_commit(path, add, ...)
 }
 
 

diff --git a/tests/testthat/test-reports.R b/tests/testthat/test-reports.R
@@ -1,6 +1,5 @@
 test_that("can get list of reports", {
   root <- test_prepare_orderly_example(c("data", "parameters"))
-  helper_add_git(root)
 
   reports <- get_reports(root = root, ref = "HEAD")
   expect_setequal(reports$name, c("data", "parameters"))
@@ -9,7 +8,6 @@ test_that("can get list of reports", {
 
 test_that("report list includes last modification time", {
   root <- test_prepare_orderly_example(c("data", "parameters"))
-  helper_add_git(root)
 
   writeLines("Hello", file.path(root, "src/data/hello.txt"))
   writeLines("World", file.path(root, "src/parameters/world.txt"))
@@ -40,7 +38,6 @@ test_that("report list includes last modification time", {
 
 test_that("report list includes modification status", {
   root <- test_prepare_orderly_example(c("data", "parameters"))
-  helper_add_git(root)
 
   writeLines("Hello", file.path(root, "src/data/hello.txt"))
   git_add_and_commit(root)