Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git2r compatibility #36

Merged
merged 9 commits into from Jul 10, 2018
Merged

git2r compatibility #36

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2bb77c1
Merge branch 'development'
achubaty Jun 14, 2018
e7e6ae4
Merge branch 'development'
achubaty Jun 14, 2018
43fca1f
Merge branch 'development'
achubaty Jun 14, 2018
311ddf8
Merge branch 'development'
achubaty Jun 14, 2018
98b1178
Merge branch 'development'
achubaty Jun 15, 2018
93f4cc8
Merge branch 'development'
achubaty Jun 15, 2018
3b22cf9
Merge branch 'development'
achubaty Jun 15, 2018
518453c
Merge branch 'development'
achubaty Jul 5, 2018
84ff75c
Implement backwards compatibility with git2r in tests
stewid Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions tests/testthat/test-git.R
View file
Open in desktop
Expand Up @@ -35,7 +35,16 @@ test_that("git-related functions work", {
expect_true(git2r::is_local(git2r::branches(testRepo)$master))
expect_identical(git2r::remote_url(testRepo),
"https://github.com/PredictiveEcology/reproducible.git")
expect_identical(git2r::head(testRepo)@sha, specificCommit)

## Backwards compatibility with git2r
## S4 <= 0.21.0
## S3 >= 0.22.0
if (isS4(testRepo)) {
expect_identical(git2r::head(testRepo)@sha, specificCommit)
} else {
expect_identical(git2r::sha(git2r::repository_head(testRepo)), specificCommit)
}

rm(testRepo)
unlink(tmpDir, force = TRUE, recursive = TRUE)

Expand All @@ -48,7 +57,16 @@ test_that("git-related functions work", {
expect_true(git2r::is_local(git2r::branches(testRepo)$master))
expect_identical(git2r::remote_url(testRepo),
"https://github.com/PredictiveEcology/reproducible.git")
expect_identical(git2r::head(testRepo)@name, "master")

## Backwards compatibility with git2r
## S4 <= 0.21.0
## S3 >= 0.22.0
if (isS4(testRepo)) {
expect_identical(git2r::head(testRepo)@name, "master")
} else {
expect_identical(git2r::repository_head(testRepo)$name, "master")
}

rm(testRepo)
unlink(tmpDir, force = TRUE, recursive = TRUE)

Expand Down