fix barchart

Author: m7pr

tests/testthat/test-shinytest2-tm_g_barchart_simple.R

@@ -117,12 +117,16 @@ testthat::test_that("e2e - tm_g_barchart_simple: Module initializes in teal with
   skip_if_too_deep(5)
 
   app_driver <- app_driver_tm_g_barchart_simple()
+  app_driver$wait_for_idle()
   app_driver$expect_no_shiny_error()
   app_driver$expect_no_validation_error()
-  testthat::expect_true(
-    app_driver$is_visible(app_driver$namespaces(TRUE)$module("myplot-plot_out_main"))
+  testthat::expect_match(
+    app_driver$get_active_module_plot_output("myplot"),
+    "data:image/png;base64,"
   )
 
+  # Table is rendered asynchronously, wait a bit more
+  app_driver$wait_for_idle()
   testthat::expect_true(app_driver$is_visible(app_driver$namespaces(TRUE)$module("table")))
 
   app_driver$stop()
@@ -134,9 +138,10 @@ testthat::test_that(
   {
     skip_if_too_deep(5)
     app_driver <- app_driver_tm_g_barchart_simple()
+    app_driver$wait_for_idle()
 
     testthat::expect_equal(
-      trimws(app_driver$get_text("#teal-teal_modules-active_tab .active")),
+      app_driver$get_text("a.nav-link.active"),
       "ADAE Analysis (e2e)"
     )
 
@@ -194,8 +199,10 @@ testthat::test_that(
   {
     skip_if_too_deep(5)
     app_driver <- app_driver_tm_g_barchart_simple()
+    app_driver$wait_for_idle()
     plot_before <- app_driver$get_active_module_plot_output("myplot")
-    app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), "RACE")
+    app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), "RACE")
+    app_driver$wait_for_idle()
     testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
     app_driver$expect_no_validation_error()
     app_driver$stop()
@@ -205,13 +212,14 @@ testthat::test_that(
 testthat::test_that("e2e - tm_g_barchart_simple: Deselection of 'x' throws validation error.", {
   skip_if_too_deep(5)
   app_driver <- app_driver_tm_g_barchart_simple()
-  app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), character(0L))
+  app_driver$wait_for_idle()
+  app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), character(0L))
   app_driver$expect_validation_error()
   testthat::expect_match(
     app_driver$get_text(app_driver$namespaces(TRUE)$module(
       sprintf(
-        "%s .shiny-validation-message",
-        ns_des_input("x", "ADSL", "select_input")
+        "%s_input .shiny-validation-message",
+        ns_des_input("x", "ADSL", "select")
       )
     )),
     "^Please select an x-variable$"
@@ -230,11 +238,15 @@ test_dataset_selection <- function(input_id, new_dataset, new_value) {
     {
       skip_if_too_deep(5)
       app_driver <- app_driver_tm_g_barchart_simple()
+      app_driver$wait_for_idle()
       plot_before <- app_driver$get_active_module_plot_output("myplot")
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), new_dataset)
+      app_driver$set_active_module_input(sprintf("%s-dataset", input_id), new_dataset)
+      app_driver$wait_for_idle()
       testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
       testthat::expect_null(app_driver$get_active_module_input(ns_des_input(input_id, new_dataset, "select")))
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input(input_id, new_dataset, "select")), new_value)
+      # Wait for UI to update with new dataset options before setting value
+      app_driver$wait_for_idle()
+      app_driver$set_active_module_input(ns_des_input(input_id, new_dataset, "select"), new_value)
       app_driver$wait_for_idle()
       testthat::expect_identical(
         app_driver$get_active_module_input(ns_des_input(input_id, new_dataset, "select")),
@@ -254,8 +266,10 @@ test_dataset_selection <- function(input_id, new_dataset, new_value) {
     {
       skip_if_too_deep(5)
       app_driver <- app_driver_tm_g_barchart_simple()
+      app_driver$wait_for_idle()
       plot_before <- app_driver$get_active_module_plot_output("myplot")
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), character(0L))
+      app_driver$set_active_module_input(sprintf("%s-dataset", input_id), character(0L))
+      app_driver$wait_for_idle()
       testthat::expect_null(app_driver$get_active_module_input(input_id))
       testthat::expect_false(identical(plot_before, app_driver$get_active_module_plot_output("myplot")))
       app_driver$expect_no_validation_error()
@@ -279,17 +293,19 @@ for (input_id in c("fill", "x_facet", "y_facet")) {
     {
       skip_if_too_deep(5)
       app_driver <- app_driver_tm_g_barchart_simple()
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input("x", "ADSL", "select")), "ACTARM", wait_ = FALSE)
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(sprintf("%s-dataset", input_id)), "ADSL", wait_ = FALSE)
-      app_driver$set_input(app_driver$namespaces(TRUE)$module(ns_des_input(input_id, "ADSL", "select")), "ACTARM")
+      app_driver$wait_for_idle()
+      app_driver$set_active_module_input(ns_des_input("x", "ADSL", "select"), "ACTARM", wait_ = FALSE)
+      app_driver$set_active_module_input(sprintf("%s-dataset", input_id), "ADSL", wait_ = FALSE)
+      app_driver$set_active_module_input(ns_des_input(input_id, "ADSL", "select"), "ACTARM")
+      app_driver$wait_for_idle()
 
       app_driver$expect_validation_error()
 
       testthat::expect_match(
         app_driver$get_text(app_driver$namespaces(TRUE)$module(
           sprintf(
-            "%s .shiny-validation-message",
-            ns_des_input("x", "ADSL", "select_input")
+            "%s_input .shiny-validation-message",
+            ns_des_input("x", "ADSL", "select")
           )
         )),
         "^Duplicated value: ACTARM$"
@@ -298,8 +314,8 @@ for (input_id in c("fill", "x_facet", "y_facet")) {
       testthat::expect_match(
         app_driver$get_text(app_driver$namespaces(TRUE)$module(
           sprintf(
-            "%s .shiny-validation-message",
-            ns_des_input(input_id, "ADSL", "select_input")
+            "%s_input .shiny-validation-message",
+            ns_des_input(input_id, "ADSL", "select")
           )
         )),
         "^Duplicated value: ACTARM$"
@@ -320,7 +336,9 @@ test_that_plot_settings <- function(input_id, new_value, setup_fun = function(ap
     {
       skip_if_too_deep(5)
       app_driver <- app_driver_tm_g_barchart_simple()
+      app_driver$wait_for_idle()
       setup_fun(app_driver)
+      app_driver$wait_for_idle()
       plot_before <- app_driver$get_active_module_plot_output("myplot")
       app_driver$set_active_module_input(input_id, new_value)
       app_driver$wait_for_idle()
@@ -345,5 +363,8 @@ test_that_plot_settings("show_n", TRUE)
 test_that_plot_settings(
   "rotate_bar_labels",
   FALSE,
-  setup_fun = function(app_driver) app_driver$set_input(app_driver$namespaces(TRUE)$module("label_bars"), TRUE)
+  setup_fun = function(app_driver) {
+    app_driver$set_active_module_input("label_bars", TRUE)
+    return(NULL)
+  }
 )