From 8a5b7cbf7b18ec4e67c578ca2885329ce4c4bc94 Mon Sep 17 00:00:00 2001 From: m7pr Date: Thu, 18 Apr 2024 12:11:37 +0200 Subject: [PATCH] use active_module_element --- .../testthat/test-shinytest2-tm_g_bivariate.R | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_g_bivariate.R b/tests/testthat/test-shinytest2-tm_g_bivariate.R index 70c7fc686..420b91e37 100644 --- a/tests/testthat/test-shinytest2-tm_g_bivariate.R +++ b/tests/testthat/test-shinytest2-tm_g_bivariate.R @@ -82,23 +82,25 @@ testthat::test_that("e2e - tm_g_bivariate: facetting options are hidden when fac app_driver <- app_driver_tm_g_bivariate() - module_ns <- app_driver$active_module_ns() - row_facet_selector <- sprintf("#%s-row_facet-dataset_CO2_singleextract-select", module_ns) - col_facet_selector <- sprintf("#%s-col_facet-dataset_CO2_singleextract-select", module_ns) - x_scale_selector <- sprintf("#%s-free_x_scales", module_ns) - y_scale_selector <- sprintf("#%s-free_y_scales", module_ns) - - testthat::expect_true(app_driver$is_visible(row_facet_selector)) - testthat::expect_true(app_driver$is_visible(col_facet_selector)) - testthat::expect_true(app_driver$is_visible(x_scale_selector)) - testthat::expect_true(app_driver$is_visible(y_scale_selector)) + testthat::expect_true(app_driver$is_visible( + app_driver$active_module_element("row_facet-dataset_CO2_singleextract-select")) + ) + testthat::expect_true( + app_driver$is_visible(app_driver$active_module_element("col_facet-dataset_CO2_singleextract-select")) + ) + testthat::expect_true(app_driver$is_visible(app_driver$active_module_element("free_x_scales"))) + testthat::expect_true(app_driver$is_visible(app_driver$active_module_element("free_y_scales"))) app_driver$set_active_module_input("facetting", FALSE) - testthat::expect_false(app_driver$is_visible(row_facet_selector)) - testthat::expect_false(app_driver$is_visible(col_facet_selector)) - testthat::expect_false(app_driver$is_visible(x_scale_selector)) - testthat::expect_false(app_driver$is_visible(y_scale_selector)) + testthat::expect_false(app_driver$is_visible( + app_driver$active_module_element("row_facet-dataset_CO2_singleextract-select")) + ) + testthat::expect_false( + app_driver$is_visible(app_driver$active_module_element("col_facet-dataset_CO2_singleextract-select")) + ) + testthat::expect_false(app_driver$is_visible(app_driver$active_module_element("free_x_scales"))) + testthat::expect_false(app_driver$is_visible(app_driver$active_module_element("free_y_scales"))) app_driver$stop() })