Skip to content

Commit dcb444e

Browse files
committed
Fix tests to prepare for upcoming leaflet v2.2.0 release
For rstudio/leaflet#876
1 parent cc0fcd0 commit dcb444e

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

tests/testthat/test-controls.R

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ testthat::test_that("Initialize map dependencies in addOpacitySlider", {
1717
addRasterImage(r, layerId = "raster", project = FALSE) %>%
1818
addOpacitySlider(layerId = "raster")
1919

20-
expect_equal(res$dependencies[[1]]$name, "jquery-ui")
21-
expect_equal(res$dependencies[[2]]$name, "opacity")
20+
expect_contains(
21+
vapply(res$dependencies, function(x) x$name, character(1)),
22+
c("jquery-ui", "opacity")
23+
)
2224
})
2325

2426
testthat::test_that("Initialize map dependencies in addLowerOpacity", {
@@ -33,8 +35,10 @@ testthat::test_that("Initialize map dependencies in addLowerOpacity", {
3335
addRasterImage(r, layerId = "raster", project = FALSE) %>%
3436
addLowerOpacity(layerId = "raster")
3537

36-
expect_equal(res$dependencies[[1]]$name, "jquery-ui")
37-
expect_equal(res$dependencies[[2]]$name, "opacity")
38+
expect_contains(
39+
vapply(res$dependencies, function(x) x$name, character(1)),
40+
c("jquery-ui", "opacity")
41+
)
3842
})
3943

4044
testthat::test_that("Initialize map dependencies in addHigherOpacity", {
@@ -49,8 +53,10 @@ testthat::test_that("Initialize map dependencies in addHigherOpacity", {
4953
addRasterImage(r, layerId = "raster", project = FALSE) %>%
5054
addHigherOpacity(layerId = "raster")
5155

52-
expect_equal(res$dependencies[[1]]$name, "jquery-ui")
53-
expect_equal(res$dependencies[[2]]$name, "opacity")
56+
expect_contains(
57+
vapply(res$dependencies, function(x) x$name, character(1)),
58+
c("jquery-ui", "opacity")
59+
)
5460
})
5561

5662
testthat::test_that("Add javascript code with addOpacitySlider", {

0 commit comments

Comments
 (0)