From dcb444ee179670c238c73188706715cb027464bc Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 15 Aug 2023 08:50:02 -0400 Subject: [PATCH] Fix tests to prepare for upcoming leaflet v2.2.0 release For rstudio/leaflet#876 --- tests/testthat/test-controls.R | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/testthat/test-controls.R b/tests/testthat/test-controls.R index dbc6b2f..ca2b40f 100644 --- a/tests/testthat/test-controls.R +++ b/tests/testthat/test-controls.R @@ -17,8 +17,10 @@ testthat::test_that("Initialize map dependencies in addOpacitySlider", { addRasterImage(r, layerId = "raster", project = FALSE) %>% addOpacitySlider(layerId = "raster") - expect_equal(res$dependencies[[1]]$name, "jquery-ui") - expect_equal(res$dependencies[[2]]$name, "opacity") + expect_contains( + vapply(res$dependencies, function(x) x$name, character(1)), + c("jquery-ui", "opacity") + ) }) testthat::test_that("Initialize map dependencies in addLowerOpacity", { @@ -33,8 +35,10 @@ testthat::test_that("Initialize map dependencies in addLowerOpacity", { addRasterImage(r, layerId = "raster", project = FALSE) %>% addLowerOpacity(layerId = "raster") - expect_equal(res$dependencies[[1]]$name, "jquery-ui") - expect_equal(res$dependencies[[2]]$name, "opacity") + expect_contains( + vapply(res$dependencies, function(x) x$name, character(1)), + c("jquery-ui", "opacity") + ) }) testthat::test_that("Initialize map dependencies in addHigherOpacity", { @@ -49,8 +53,10 @@ testthat::test_that("Initialize map dependencies in addHigherOpacity", { addRasterImage(r, layerId = "raster", project = FALSE) %>% addHigherOpacity(layerId = "raster") - expect_equal(res$dependencies[[1]]$name, "jquery-ui") - expect_equal(res$dependencies[[2]]$name, "opacity") + expect_contains( + vapply(res$dependencies, function(x) x$name, character(1)), + c("jquery-ui", "opacity") + ) }) testthat::test_that("Add javascript code with addOpacitySlider", {