From 1a49730e3cefacdd6f3d04b89b466848093567ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 25 Nov 2025 10:09:39 +0100 Subject: [PATCH 1/3] Refactor UI tests --- tests/testthat/test-shinytest2-tm_t_events.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_by_grade.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_patyear.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_summary.R | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_t_events.R b/tests/testthat/test-shinytest2-tm_t_events.R index db1e1f8a4..f7db87535 100644 --- a/tests/testthat/test-shinytest2-tm_t_events.R +++ b/tests/testthat/test-shinytest2-tm_t_events.R @@ -59,7 +59,7 @@ testthat::test_that( app_driver <- app_driver_tm_t_events() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_tab .active > a"), + app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), "Adverse Event Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R index b173daef4..7aa17044b 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R +++ b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R @@ -71,7 +71,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_by_grade() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_tab .active > a"), + app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), "Adverse Events by Grade Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_patyear.R b/tests/testthat/test-shinytest2-tm_t_events_patyear.R index b8304533f..81a28978e 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_patyear.R +++ b/tests/testthat/test-shinytest2-tm_t_events_patyear.R @@ -72,7 +72,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_patyear() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_tab .active > a"), + app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), "AE Rate Adjusted for Patient-Years At Risk Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_summary.R b/tests/testthat/test-shinytest2-tm_t_events_summary.R index be833026b..7faa20c32 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_summary.R +++ b/tests/testthat/test-shinytest2-tm_t_events_summary.R @@ -111,7 +111,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_summary() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_tab .active > a"), + app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), "Adverse Events Summary" ) testthat::expect_equal( From 306b28e30057ea2747051b2b03a0c3acc879f5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 25 Nov 2025 12:39:38 +0100 Subject: [PATCH 2/3] Use shorter selector --- tests/testthat/test-shinytest2-tm_t_events.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_by_grade.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_patyear.R | 2 +- tests/testthat/test-shinytest2-tm_t_events_summary.R | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_t_events.R b/tests/testthat/test-shinytest2-tm_t_events.R index f7db87535..9da5d85f2 100644 --- a/tests/testthat/test-shinytest2-tm_t_events.R +++ b/tests/testthat/test-shinytest2-tm_t_events.R @@ -59,7 +59,7 @@ testthat::test_that( app_driver <- app_driver_tm_t_events() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), + app_driver$get_text("a.nav-link.active"), "Adverse Event Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R index 7aa17044b..48032cb26 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R +++ b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R @@ -71,7 +71,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_by_grade() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), + app_driver$get_text("a.nav-link.active"), "Adverse Events by Grade Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_patyear.R b/tests/testthat/test-shinytest2-tm_t_events_patyear.R index 81a28978e..196289681 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_patyear.R +++ b/tests/testthat/test-shinytest2-tm_t_events_patyear.R @@ -72,7 +72,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_patyear() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), + app_driver$get_text("a.nav-link.active"), "AE Rate Adjusted for Patient-Years At Risk Table" ) testthat::expect_equal( diff --git a/tests/testthat/test-shinytest2-tm_t_events_summary.R b/tests/testthat/test-shinytest2-tm_t_events_summary.R index 7faa20c32..74350cbbc 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_summary.R +++ b/tests/testthat/test-shinytest2-tm_t_events_summary.R @@ -111,7 +111,7 @@ testthat::test_that( skip_if_too_deep(5) app_driver <- app_driver_tm_t_events_summary() testthat::expect_equal( - app_driver$get_text("#teal-teal_modules-active_module_id * .teal-modules-tree * .nav-link"), + app_driver$get_text("a.nav-link.active"), "Adverse Events Summary" ) testthat::expect_equal( From 1da1f0404f0b3f0eff979812173bc92bea73024d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Revilla?= Date: Tue, 25 Nov 2025 15:57:42 +0100 Subject: [PATCH 3/3] Fix lintr issues --- tests/testthat/test-shinytest2-tm_t_events.R | 3 ++- tests/testthat/test-shinytest2-tm_t_events_by_grade.R | 6 ++++-- tests/testthat/test-shinytest2-tm_t_events_patyear.R | 3 ++- tests/testthat/test-shinytest2-tm_t_events_summary.R | 3 ++- tests/testthat/test-shinytest2-tm_t_shift_by_arm_by_worst.R | 6 ++++-- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_t_events.R b/tests/testthat/test-shinytest2-tm_t_events.R index 9da5d85f2..7a85fda3b 100644 --- a/tests/testthat/test-shinytest2-tm_t_events.R +++ b/tests/testthat/test-shinytest2-tm_t_events.R @@ -116,8 +116,9 @@ testthat::test_that("e2e - tm_t_events: Deselection of arm_var throws validation app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "Please select 1 or 2 treatment variable values" ) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R index 48032cb26..5259f2192 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_by_grade.R +++ b/tests/testthat/test-shinytest2-tm_t_events_by_grade.R @@ -129,8 +129,9 @@ testthat::test_that("e2e - tm_t_events_by_grade: Deselection of arm_var throws v app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "A treatment variable is required" ) app_driver$stop() @@ -232,8 +233,9 @@ testthat::test_that("e2e - tm_t_events_by_grade: Deselection of grade throws val app_driver$set_active_module_input("grade-dataset_ADAE_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("grade-dataset_ADAE_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "An event grade is required" ) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_t_events_patyear.R b/tests/testthat/test-shinytest2-tm_t_events_patyear.R index 196289681..33c37f95e 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_patyear.R +++ b/tests/testthat/test-shinytest2-tm_t_events_patyear.R @@ -168,8 +168,9 @@ testthat::test_that("e2e - tm_t_events_patyear: Deselection of arm_var throws va data.frame() ) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "Please select exactly 1 or 2 treatment variables" ) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_t_events_summary.R b/tests/testthat/test-shinytest2-tm_t_events_summary.R index 74350cbbc..57df6737f 100644 --- a/tests/testthat/test-shinytest2-tm_t_events_summary.R +++ b/tests/testthat/test-shinytest2-tm_t_events_summary.R @@ -158,8 +158,9 @@ testthat::test_that("e2e - tm_t_events_summary: Deselection of arm_var throws va app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "Please select exactly 1 or 2 treatment variables" ) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_t_shift_by_arm_by_worst.R b/tests/testthat/test-shinytest2-tm_t_shift_by_arm_by_worst.R index 0637aafbe..83eb56274 100644 --- a/tests/testthat/test-shinytest2-tm_t_shift_by_arm_by_worst.R +++ b/tests/testthat/test-shinytest2-tm_t_shift_by_arm_by_worst.R @@ -133,8 +133,9 @@ testthat::test_that("e2e - tm_t_shift_by_arm_by_worst: Deselection of arm_var th app_driver$set_active_module_input("arm_var-dataset_ADSL_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("arm_var-dataset_ADSL_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "A treatment variable is required" ) app_driver$stop() @@ -232,8 +233,9 @@ testthat::test_that("e2e - tm_t_shift_by_arm_by_worst: Deselection of aval_var t app_driver$set_active_module_input("aval_var-dataset_ADEG_singleextract-select", NULL) testthat::expect_identical(app_driver$get_active_module_table_output("table-table-with-settings"), data.frame()) app_driver$expect_validation_error() + selector <- "aval_var-dataset_ADEG_singleextract-select_input .shiny-validation-message" testthat::expect_equal( - app_driver$get_text(app_driver$namespaces(TRUE)$module("aval_var-dataset_ADEG_singleextract-select_input .shiny-validation-message")), + app_driver$get_text(app_driver$namespaces(TRUE)$module(selector)), "An analysis range indicator required" ) app_driver$stop()