Skip to content

Commit 15a1ff4

Browse files
with parallel tests, we can't rely on order, so tests requiring the pre-commit executable should be either placed in the conda tests file or be skipped if installation method is conda
1 parent d8f2dba commit 15a1ff4

File tree

2 files changed

+36
-37
lines changed

2 files changed

+36
-37
lines changed

tests/testthat/test-conda.R

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,39 @@ if (!on_cran()) {
202202
}
203203
})
204204
}
205+
206+
test_that("Autoupdate is not conducted when renv present in incompatible setup", {
207+
skip_on_cran()
208+
209+
# mock old pre-commit and renv versions
210+
local_mocked_bindings(version_precommit = function(...) "2.13.0")
211+
212+
local_test_setup(
213+
git = TRUE, use_precommit = TRUE, install_hooks = FALSE, open = FALSE
214+
)
215+
initial <- rev_read() %>%
216+
rev_as_pkg_version()
217+
# simulate adding {renv}
218+
writeLines("", "renv.lock")
219+
220+
# should downgrade rev
221+
expect_error(
222+
ensure_renv_precommit_compat(
223+
package_version_renv = package_version("0.13.0"), root = getwd()
224+
),
225+
"Please update"
226+
)
227+
downgraded <- rev_read() %>%
228+
rev_as_pkg_version()
229+
expect_true(downgraded == initial)
230+
231+
# simulate removing {renv} should be updated
232+
fs::file_delete("renv.lock")
233+
expect_warning(
234+
ensure_renv_precommit_compat(
235+
package_version("0.13.0"),
236+
root = getwd()
237+
),
238+
NA
239+
)
240+
})

tests/testthat/test-setup.R

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -82,40 +82,3 @@ test_that("Pre-commit CI setup works", {
8282
)
8383
expect_error(use_ci(root = getwd(), open = FALSE), "o `.pre-commit-config.yaml`")
8484
})
85-
86-
87-
test_that("Autoupdate is not conducted when renv present in incompatible setup", {
88-
skip_on_cran()
89-
90-
# mock old pre-commit and renv versions
91-
mockery::stub(ensure_renv_precommit_compat, "version_precommit", "2.13.0")
92-
93-
local_test_setup(
94-
git = TRUE, use_precommit = TRUE, install_hooks = FALSE, open = FALSE
95-
)
96-
initial <- rev_read() %>%
97-
rev_as_pkg_version()
98-
# simulate adding {renv}
99-
writeLines("", "renv.lock")
100-
101-
# should downgrade rev
102-
expect_error(
103-
ensure_renv_precommit_compat(
104-
package_version_renv = package_version("0.13.0"), root = getwd()
105-
),
106-
"Please update"
107-
)
108-
downgraded <- rev_read() %>%
109-
rev_as_pkg_version()
110-
expect_true(downgraded == initial)
111-
112-
# simulate removing {renv} should be updated
113-
fs::file_delete("renv.lock")
114-
expect_warning(
115-
ensure_renv_precommit_compat(
116-
package_version("0.13.0"),
117-
root = getwd()
118-
),
119-
NA
120-
)
121-
})

0 commit comments

Comments
 (0)