Skip to content

Commit 15f1b0e

Browse files
committed
fix barchart
1 parent 4cc449d commit 15f1b0e

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

tests/testthat/test-shinytest2-tm_g_barchart_simple.R

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ testthat::test_that(
195195
skip_if_too_deep(5)
196196
app_driver <- app_driver_tm_g_barchart_simple()
197197
plot_before <- app_driver$get_active_module_plot_output("myplot")
198-
app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), "RACE")
198+
app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), "RACE")
199199
testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
200200
app_driver$expect_no_validation_error()
201201
app_driver$stop()
@@ -205,7 +205,7 @@ testthat::test_that(
205205
testthat::test_that("e2e - tm_g_barchart_simple: Deselection of 'x' throws validation error.", {
206206
skip_if_too_deep(5)
207207
app_driver <- app_driver_tm_g_barchart_simple()
208-
app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), character(0L))
208+
app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), character(0L))
209209
app_driver$expect_validation_error()
210210
testthat::expect_match(
211211
app_driver$get_text(app_driver$namespaces(TRUE)$module(
@@ -231,10 +231,11 @@ test_dataset_selection <- function(input_id, new_dataset, new_value) {
231231
skip_if_too_deep(5)
232232
app_driver <- app_driver_tm_g_barchart_simple()
233233
plot_before <- app_driver$get_active_module_plot_output("myplot")
234-
app_driver$set_active_module_input(sprintf("%s-dataset", input_id), new_dataset)
234+
app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), new_dataset)
235235
testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
236236
testthat::expect_null(app_driver$get_active_module_input(ns_des_input(input_id, new_dataset, "select")))
237-
app_driver$set_active_module_input(ns_des_input(input_id, new_dataset, "select"), new_value)
237+
app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input(input_id, new_dataset, "select")), new_value)
238+
app_driver$wait_for_idle()
238239
testthat::expect_identical(
239240
app_driver$get_active_module_input(ns_des_input(input_id, new_dataset, "select")),
240241
new_value
@@ -254,7 +255,7 @@ test_dataset_selection <- function(input_id, new_dataset, new_value) {
254255
skip_if_too_deep(5)
255256
app_driver <- app_driver_tm_g_barchart_simple()
256257
plot_before <- app_driver$get_active_module_plot_output("myplot")
257-
app_driver$set_active_module_input(sprintf("%s-dataset", input_id), character(0L))
258+
app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), character(0L))
258259
testthat::expect_null(app_driver$get_active_module_input(input_id))
259260
testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
260261
app_driver$expect_no_validation_error()
@@ -278,9 +279,9 @@ for (input_id in c("fill", "x_facet", "y_facet")) {
278279
{
279280
skip_if_too_deep(5)
280281
app_driver <- app_driver_tm_g_barchart_simple()
281-
app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), "ACTARM", wait_ = FALSE)
282-
app_driver$set_active_module_input(sprintf("%s-dataset", input_id), "ADSL", wait_ = FALSE)
283-
app_driver$set_active_module_input(ns_des_input(input_id, "ADSL", "select"), "ACTARM")
282+
app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), "ACTARM", wait_ = FALSE)
283+
app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), "ADSL", wait_ = FALSE)
284+
app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input(input_id, "ADSL", "select")), "ACTARM")
284285

285286
app_driver$expect_validation_error()
286287

@@ -322,6 +323,7 @@ test_that_plot_settings <- function(input_id, new_value, setup_fun = function(ap
322323
setup_fun(app_driver)
323324
plot_before <- app_driver$get_active_module_plot_output("myplot")
324325
app_driver$set_active_module_input(input_id, new_value)
326+
app_driver$wait_for_idle()
325327
testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
326328
app_driver$expect_no_validation_error()
327329
app_driver$stop()
@@ -343,5 +345,5 @@ test_that_plot_settings("show_n", TRUE)
343345
test_that_plot_settings(
344346
"rotate_bar_labels",
345347
FALSE,
346-
setup_fun = function(app_driver) app_driver$set_active_module_input("label_bars", TRUE)
348+
setup_fun = function(app_driver) app_driver$set_input(app_driver$namespaces(TRUE)$module("label_bars"), TRUE)
347349
)

0 commit comments

Comments
 (0)