Skip to content

Commit 9b494ac

Browse files
committed
Better name for this test skipper
1 parent c9a4f1a commit 9b494ac

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

tests/testthat/helper.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ skip_if_not_ci <- function() {
9090
skip("Not on GitHub Actions, Travis, or Appveyor")
9191
}
9292

93-
skip_if_no_git_config <- function() {
93+
skip_if_no_git_user <- function() {
9494
cfg <- git2r::config()
9595
user_name <- cfg$local$`user.name` %||% cfg$global$`user.name`
9696
user_email <- cfg$local$`user.email` %||% cfg$global$`user.email`

tests/testthat/test-git.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test_that("git_has_commit() changes after first commit", {
2-
skip_if_no_git_config()
2+
skip_if_no_git_user()
33

44
scoped_temporary_package()
55
git_init()

tests/testthat/test-github-actions.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
context("GitHub Actions")
22

33
test_that("uses_github_actions() reports usage of GitHub Actions", {
4-
skip_if_no_git_config()
4+
skip_if_no_git_user()
55

66
scoped_temporary_package()
77
expect_false(uses_github_actions())
@@ -22,7 +22,7 @@ test_that("check_uses_github_actions() can throw error", {
2222
})
2323

2424
test_that("use_github_actions() configures GitHub Actions", {
25-
skip_if_no_git_config()
25+
skip_if_no_git_user()
2626

2727
scoped_temporary_package()
2828
use_git()
@@ -52,7 +52,7 @@ test_that("use_github_actions() configures GitHub Actions", {
5252
})
5353

5454
test_that("use_github_actions() configures .Rbuildignore", {
55-
skip_if_no_git_config()
55+
skip_if_no_git_user()
5656

5757
scoped_temporary_package()
5858
expect_false(uses_circleci())
@@ -64,7 +64,7 @@ test_that("use_github_actions() configures .Rbuildignore", {
6464
})
6565

6666
test_that("use_github_action_check_full() configures full GitHub Actions", {
67-
skip_if_no_git_config()
67+
skip_if_no_git_user()
6868

6969
scoped_temporary_package()
7070
use_git()
@@ -97,7 +97,7 @@ test_that("use_github_action_check_full() configures full GitHub Actions", {
9797
})
9898

9999
test_that("use_github_action_check_full() configures the pr commands", {
100-
skip_if_no_git_config()
100+
skip_if_no_git_user()
101101

102102
scoped_temporary_package()
103103
use_git()
@@ -111,7 +111,7 @@ test_that("use_github_action_check_full() configures the pr commands", {
111111
})
112112

113113
test_that("use_tidy_github_actions() configures the full check and pr commands", {
114-
skip_if_no_git_config()
114+
skip_if_no_git_user()
115115

116116
scoped_temporary_package()
117117
use_git()

tests/testthat/test-use-badge.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test_that("use_lifecycle_badge() handles bad and good input", {
1515

1616
test_that("use_binder_badge() needs a github repository", {
1717
skip_if(getRversion() < 3.2)
18-
skip_if_no_git_config()
18+
skip_if_no_git_user()
1919
scoped_temporary_project()
2020
expect_error(use_binder_badge())
2121
})

tests/testthat/test-use-circleci.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
context("use_circleci")
22

33
test_that("uses_circleci() reports usage of CircleCI", {
4-
skip_if_no_git_config()
4+
skip_if_no_git_user()
55

66
scoped_temporary_package()
77
expect_false(uses_circleci())
@@ -21,7 +21,7 @@ test_that("check_uses_circleci() can throw error", {
2121
})
2222

2323
test_that("use_circleci() configures CircleCI", {
24-
skip_if_no_git_config()
24+
skip_if_no_git_user()
2525

2626
scoped_temporary_package()
2727
use_git()
@@ -37,7 +37,7 @@ test_that("use_circleci() configures CircleCI", {
3737
})
3838

3939
test_that("use_circleci() specifies Docker image", {
40-
skip_if_no_git_config()
40+
skip_if_no_git_user()
4141

4242
scoped_temporary_package()
4343
use_git()
@@ -49,7 +49,7 @@ test_that("use_circleci() specifies Docker image", {
4949
})
5050

5151
test_that("use_circleci() properly formats keys for cache", {
52-
skip_if_no_git_config()
52+
skip_if_no_git_user()
5353

5454
scoped_temporary_package()
5555
use_git()
@@ -67,7 +67,7 @@ test_that("use_circleci() properly formats keys for cache", {
6767
})
6868

6969
test_that("use_circleci() configures .Rbuildignore", {
70-
skip_if_no_git_config()
70+
skip_if_no_git_user()
7171

7272
scoped_temporary_package()
7373
expect_false(uses_circleci())

tests/testthat/test-use-git.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test_that('use_git_config(scope = "project) errors if project not using git', {
99
})
1010

1111
test_that("use_git_config() can set local config", {
12-
skip_if_no_git_config()
12+
skip_if_no_git_user()
1313

1414
scoped_temporary_package()
1515
use_git()
@@ -36,7 +36,7 @@ test_that("use_git_hook errors if project not using git", {
3636
})
3737

3838
test_that("git remote handlers work", {
39-
skip_if_no_git_config()
39+
skip_if_no_git_user()
4040

4141
scoped_temporary_package()
4242
use_git()

tests/testthat/test-use-readme.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test_that("use_readme_rmd() creates README.Rmd", {
1515
})
1616

1717
test_that("use_readme_rmd() sets up git pre-commit hook if pkg uses git", {
18-
skip_if_no_git_config()
18+
skip_if_no_git_user()
1919
skip_if_not_installed("rmarkdown")
2020

2121
scoped_temporary_package()

tests/testthat/test-use-tidy-style.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("use_tidy_style")
22

33
test_that("styling the package works", {
44
skip_if(getRversion() < 3.2)
5-
skip_if_no_git_config()
5+
skip_if_no_git_user()
66
skip_if_not_installed("styler")
77

88
pkg <- scoped_temporary_package()
@@ -17,7 +17,7 @@ test_that("styling the package works", {
1717

1818
test_that("styling of non-packages works", {
1919
skip_if(getRversion() < 3.2)
20-
skip_if_no_git_config()
20+
skip_if_no_git_user()
2121
skip_if_not_installed("styler")
2222

2323
proj <- scoped_temporary_project()

0 commit comments

Comments
 (0)