Fix tests for new git2r

r-lib · Mar 13, 2018 · 8944e11 · 8944e11
1 parent 21fe55a
commit 8944e11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/testthat/test-git.R b/tests/testthat/test-git.R
@@ -12,9 +12,11 @@ git_test_repo <- function() {
 }
 
 test_that("SHA for regular repository", {
+  skip_on_cran()
+
   r <- git_test_repo()
   commit <- git2r::commits(r)[[1]]
-  expect_false(git2r::is_commit(utils::head(r)))
+  expect_false(git2r::is_commit(git2r::repository_head(r)))
   expect_equal(git_repo_sha1(r), as.data.frame(commit)$sha)
 })
 
@@ -24,6 +26,6 @@ test_that("SHA for detached head", {
   r <- git_test_repo()
   commit <- git2r::commits(r)[[1]]
   git2r::checkout(commit)
-  expect_true(git2r::is_commit(utils::head(r)))
+  expect_true(git2r::is_commit(git2r::repository_head(r)))
   expect_equal(git_repo_sha1(r), as.data.frame(commit)$sha)
 })
diff --git a/tests/testthat/test-remote-metadata.R b/tests/testthat/test-remote-metadata.R
@@ -39,7 +39,7 @@ test_that("install on packages adds metadata", {
     library("testMetadataInstall")
     pkg_info <- session_info()$packages
     pkg_source <- pkg_info[pkg_info[, "package"] %in% "testMetadataInstall", "source"]
-    pkg_sha <- substring(git2r::commits(r)[[1]]@sha, 1, 7)
+    pkg_sha <- substring(git2r::commits(r)[[1]]$sha, 1, 7)
     expect_match(pkg_source, pkg_sha)
 
     # dirty the repo
@@ -56,7 +56,7 @@ test_that("install on packages adds metadata", {
     install(test_pkg, quiet = TRUE)
     pkg_info <- session_info()$packages
     pkg_source <- pkg_info[pkg_info[, "package"] %in% "testMetadataInstall", "source"]
-    pkg_sha <- substring(git2r::commits(r)[[1]]@sha, 1, 7)
+    pkg_sha <- substring(git2r::commits(r)[[1]]$sha, 1, 7)
     expect_match(pkg_source, pkg_sha)
 
   })