Fix unit tests for other default branch names

Author: jeroen

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: gert
 Title: Simple Git Client for R
-Version: 2.1.5
+Version: 2.2.0
 Authors@R: c(
     person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
       comment = c(ORCID = "0000-0002-4035-0289")),

NEWS

@@ -1,5 +1,6 @@
 2.2.0
   - Windows: update to libgit2 1.9.1
+  - Fix unit tests for other default branch names
 
 2.1.4
   - Fix for libgit2 1.8.2 reverting their API change from 1.8.0

tests/testthat/test-commit.R

@@ -100,13 +100,14 @@ test_that("status reports a conflicted file", {
   writeLines("cranky-crab-legs", foo_path)
   git_add("foo.txt", repo = repo)
   base <- git_commit("Add a file", repo = repo)
+  main <- git_branch(repo = repo)
 
   git_branch_create("my-branch", repo = repo)
   writeLines("cranky-CRAB-LEGS", foo_path)
   git_add("foo.txt", repo = repo)
   git_commit("Uppercase last 2 words", repo = repo)
 
-  git_branch_checkout("master", repo = repo)
+  git_branch_checkout(main, repo = repo)
   expect_equal(git_merge_analysis("my-branch", repo = repo), "fastforward")
 
   writeLines("CRANKY-CRAB-legs", foo_path)

tests/testthat/test-merge.R

@@ -10,15 +10,16 @@ test_that("merge analysis works", {
     git_add("test.txt")
     git_commit(paste("This is commit number:", i))
   }
+  main <- git_branch()
   master_log <- git_log()
   first_commit <- tail(master_log$commit, 1)
   git_branch_create('new', first_commit)
   git_branch_checkout('new')
   expect_equal(git_log()$commit, tail(master_log,1)$commit)
-  expect_equal(git_merge_analysis('master'), 'fastforward')
+  expect_equal(git_merge_analysis(main), 'fastforward')
 
   # Expect no merge commit (ffwd)
-  git_merge("master")
+  git_merge(main)
   expect_equal(master_log, git_log())
 
   # Create a branch that diverges
@@ -27,18 +28,18 @@ test_that("merge analysis works", {
   writeLines('Something else', 'test2.txt')
   git_add('test2.txt')
   git_commit("Some other commit")
-  expect_equal(git_merge_find_base('master'), first_commit)
+  expect_equal(git_merge_find_base(main), first_commit)
 
   # Require merge commit
-  expect_equal(git_merge_analysis('master'), 'normal')
-  git_merge('master')
+  expect_equal(git_merge_analysis(main), 'normal')
+  git_merge(main)
   newlog <- git_log()
   expect_length(newlog$commit, 3)
   expect_equal(newlog$merge, c(TRUE, FALSE, FALSE))
   expect_null(git_merge_parent_heads())
 
   # Expect no changes
-  git_merge('master')
+  git_merge(main)
   expect_equal(git_log(), newlog)
 })