Fixes TealAppDriver & implement regression tests

DESCRIPTION

@@ -81,7 +81,7 @@ RdMacros:
     lifecycle
 Remotes:
     insightsengineering/teal.reporter@main,
-    insightsengineering/teal.slice@main,
+    insightsengineering/teal.slice@651_regr_test@main,
     insightsengineering/teal.widgets@main
 Config/Needs/verdepcheck: rstudio/shiny, insightsengineering/teal.data,
     insightsengineering/teal.slice, mllg/checkmate, jeroen/jsonlite,

R/TealAppDriver.R

@@ -452,7 +452,7 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
             replacement = "",
             self$get_text(
               sprintf(
-                "#%s-filters-%s .filter-card-varname",
+                "#%s-filters-%s-container .filter-card-varname",
                 self$active_filters_ns(),
                 x
               )
@@ -694,7 +694,7 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
       tab_ns <- unlist(lapply(names(active_tab_inputs), function(name) {
         gsub(
           pattern = "-active_module_id$",
-          replacement = sprintf("-%s", active_tab_inputs[[name]]),
+          replacement = sprintf("-nav-%s", .label_to_id(active_tab_inputs[[name]])),
           name
         )
       }))
@@ -707,19 +707,9 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
           }
         }
       }
-      private$ns$module <- sprintf("%s-%s", active_ns, "module")
-
-      components <- c("filter_panel", "data_summary")
-      for (component in components) {
-        if (
-          !is.null(self$get_html(sprintf("#%s-%s-panel", active_ns, component))) ||
-            !is.null(self$get_html(sprintf("#%s-%s-table", active_ns, component)))
-        ) {
-          private$ns[[component]] <- sprintf("%s-%s", active_ns, component)
-        } else {
-          private$ns[[component]] <- sprintf("%s-module_%s", active_ns, component)
-        }
-      }
+      private$ns$module <- sprintf("%s-module", active_ns)
+      private$ns$filter_panel <- sprintf("%s-filter_panel", active_ns)
+      private$ns$data_summary <- sprintf("%s-data_summary", active_ns)
     },
     # @description
     # Get the active filter values from the active filter selection of dataset from the filter panel.

R/reporter_previewer_module.R

@@ -39,10 +39,11 @@ reporter_previewer_module <- function(label = "Report previewer", server_args =
     server = srv, ui = ui,
     server_args = server_args, ui_args = list(), datanames = NULL
   )
-  # Module is created with a placeholder label and the label is changed later.
+  # Module is created with a placeholder label and path and both are changed later.
   # This is to prevent another module being labeled "Report previewer".
   class(module) <- c(class(module), "teal_module_previewer")
   module$label <- label
+  module$path <- label
   attr(module, "teal_bookmarkable") <- TRUE
   module
 }

R/utils.R

@@ -359,7 +359,9 @@ create_app_id <- function(data, modules) {
   }
   modules <- lapply(modules, defunction)
 
-  rlang::hash(list(data = data, modules = modules))
+  # Suppress warnings of type: `package:MultiAssayExperiment' may not be available when loading`
+  # This is because the package namespace may be part of the `data` object
+  suppressWarnings(rlang::hash(list(data = data, modules = modules)))
 }
 
 #' Go through list and extract bodies of encountered functions as string, recursively.

inst/css/sidebar.css

@@ -72,13 +72,13 @@ a.disabled {
   --bs-accordion-active-bg: #c5c5c5;
 }
 
-.teal-transform-accordian .accordion-button {
+.teal-transform-accordion .accordion-button {
   --bs-accordion-btn-padding-y: 0.5rem;
   --bs-accordion-btn-padding-x: 0.5rem;
 }
 
-.teal-transform-accordian .accordion-button:not(.collapsed)::after,
-.teal-transform-accordian .accordion-button::after {
+.teal-transform-accordion .accordion-button:not(.collapsed)::after,
+.teal-transform-accordion .accordion-button::after {
   display: none;
 }
 

tests/testthat/test-module_teal.R

@@ -466,7 +466,7 @@ testthat::describe("srv_teal teal_modules", {
           `teal_modules-active_module_id` = "module_1"
         )
         out <- modules_output$module_1()
-        testthat::expect_true(!is.null(out))
+        testthat::expect_type(out, "double")
         session$setInputs(`data-teal_data_module-dataset` = "mtcars")
         testthat::expect_identical(out, modules_output$module_1())
       }

tests/testthat/test-shinytest2-data_summary.R

@@ -1,5 +1,4 @@
 testthat::test_that("e2e: data summary just list the unfilterable objects at the bottom when provided", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
   app <- TealAppDriver$new(
     data = teal.data::teal_data(x = 1, y = "z", foo = function() NULL),
@@ -15,7 +14,6 @@ testthat::test_that("e2e: data summary just list the unfilterable objects at the
 })
 
 testthat::test_that("e2e: data summary table is displayed with 2 columns data without keys", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
   app <- TealAppDriver$new(
     data = simple_teal_data(), # iris, mtcars
@@ -35,7 +33,6 @@ testthat::test_that("e2e: data summary table is displayed with 2 columns data wi
 })
 
 testthat::test_that("e2e: data summary table displays datasets by topological_sort of join_keys", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
 
   data <- teal.data::teal_data(mtcars1 = mtcars, mtcars2 = data.frame(am = c(0, 1), test = c("a", "b")))
@@ -44,10 +41,7 @@ testthat::test_that("e2e: data summary table displays datasets by topological_so
     teal.data::join_key("mtcars2", "mtcars1", keys = c("am"))
   )
 
-  app <- TealAppDriver$new(
-    data = data,
-    modules = example_module()
-  )
+  app <- TealAppDriver$new(data = data, modules = example_module())
 
   testthat::expect_identical(
     as.data.frame(app$get_active_data_summary_table())[["Data Name"]],
@@ -58,7 +52,6 @@ testthat::test_that("e2e: data summary table displays datasets by topological_so
 })
 
 testthat::test_that("e2e: data summary table is displayed with 3 columns for data with join keys", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
 
   data <- teal.data::teal_data(mtcars1 = mtcars, mtcars2 = data.frame(am = c(0, 1), test = c("a", "b")))
@@ -67,10 +60,7 @@ testthat::test_that("e2e: data summary table is displayed with 3 columns for dat
     teal.data::join_key("mtcars2", "mtcars1", keys = c("am"))
   )
 
-  app <- TealAppDriver$new(
-    data = data,
-    modules = example_module()
-  )
+  app <- TealAppDriver$new(data = data, modules = example_module())
 
   testthat::expect_identical(
     as.data.frame(app$get_active_data_summary_table()),
@@ -85,62 +75,51 @@ testthat::test_that("e2e: data summary table is displayed with 3 columns for dat
   app$stop()
 })
 
-testthat::test_that(
-  "e2e: data summary table does not list unsupported objects",
-  {
-    testthat::skip_if_not_installed("MultiAssayExperiment")
-    testthat::skip("chromium")
-    skip_if_too_deep(5)
-
-    data <- within(
-      teal.data::teal_data(),
-      {
-        mtcars1 <- mtcars
-        mtcars2 <- data.frame(am = c(0, 1), test = c("a", "b"))
-        iris <- iris
-        library(MultiAssayExperiment)
-        data("miniACC", package = "MultiAssayExperiment", envir = environment())
-        unsupported <- function(x) x
-        # nolint end: object_name.
-      }
-    )
+testthat::test_that("e2e: data summary table does not list unsupported objects", {
+  testthat::skip_if_not_installed("MultiAssayExperiment")
+  skip_if_too_deep(5)
 
-    teal.data::join_keys(data) <- teal.data::join_keys(
-      teal.data::join_key("mtcars2", "mtcars1", keys = c("am"))
-    )
+  data <- within(
+    teal.data::teal_data(),
+    {
+      mtcars1 <- mtcars
+      mtcars2 <- data.frame(am = c(0, 1), test = c("a", "b"))
+      iris <- iris
+      library(MultiAssayExperiment)
+      data("miniACC", package = "MultiAssayExperiment", envir = environment())
+      unsupported <- function(x) x
+      # nolint end: object_name.
+    }
+  )
 
-    app <- TealAppDriver$new(
-      data = data,
-      modules = example_module()
-    )
+  teal.data::join_keys(data) <- teal.data::join_keys(
+    teal.data::join_key("mtcars2", "mtcars1", keys = c("am"))
+  )
+
+  app <- TealAppDriver$new(data = data, modules = example_module())
 
-    testthat::expect_identical(
-      as.data.frame(app$get_active_data_summary_table()),
-      data.frame(
-        `Data Name` = c(
-          "iris", "miniACC", "- RNASeq2GeneNorm", "- gistict", "- RPPAArray", "- Mutations", "- miRNASeqGene",
-          "mtcars2", "mtcars1"
-        ),
-        Obs = c("150/150", "", "198/198", "198/198", "33/33", "97/97", "471/471", "2/2", "32/32"),
-        Subjects = c("", "92/92", "79/79", "90/90", "46/46", "90/90", "80/80", "", "2/2"),
-        check.names = FALSE
-      )
+  testthat::expect_identical(
+    as.data.frame(app$get_active_data_summary_table()),
+    data.frame(
+      `Data Name` = c(
+        "iris", "miniACC", "- RNASeq2GeneNorm", "- gistict", "- RPPAArray", "- Mutations", "- miRNASeqGene",
+        "mtcars2", "mtcars1"
+      ),
+      Obs = c("150/150", "", "198/198", "198/198", "33/33", "97/97", "471/471", "2/2", "32/32"),
+      Subjects = c("", "92/92", "79/79", "90/90", "46/46", "90/90", "80/80", "", "2/2"),
+      check.names = FALSE
     )
+  )
 
-    app$stop()
-  }
-)
+  app$stop()
+})
 
 testthat::test_that("e2e: data summary table displays datasets by names() order if no join_keys", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
 
   data <- teal.data::teal_data(mtcars1 = mtcars, mtcars2 = data.frame(am = c(0, 1), test = c("a", "b")))
 
-  app <- TealAppDriver$new(
-    data = data,
-    modules = example_module()
-  )
+  app <- TealAppDriver$new(data = data, modules = example_module())
 
   testthat::expect_identical(
     as.data.frame(app$get_active_data_summary_table())[["Data Name"]],
@@ -149,3 +128,17 @@ testthat::test_that("e2e: data summary table displays datasets by names() order
 
   app$stop()
 })
+
+testthat::test_that("e2e: data summary UI can be collpased and expanded (`bslib` regression)", {
+  skip_if_too_deep(5)
+
+  data <- teal.data::teal_data(mtcars1 = mtcars, mtcars2 = data.frame(am = c(0, 1), test = c("a", "b")))
+  app <- TealAppDriver$new(data = data, modules = example_module())
+
+  # Visible by default
+  testthat::expect_true(app$is_visible(".teal-active-data-summary-panel .accordion-collapse"))
+  app$click(selector = ".teal-active-data-summary-panel .accordion-header button")
+  testthat::expect_false(app$is_visible(".teal-active-data-summary-panel .accordion-collapse"))
+
+  app$stop()
+})

tests/testthat/test-shinytest2-decorators.R

@@ -2,7 +2,6 @@ testthat::skip_if_not_installed("shinytest2")
 testthat::skip_if_not_installed("rvest")
 
 testthat::test_that("e2e: module with decorator UI and output is modified interactively upon changes in decorator", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
 
   interactive_decorator <- teal_transform_module(
@@ -44,9 +43,7 @@ testthat::test_that("e2e: module with decorator UI and output is modified intera
   )
 
   testthat::expect_identical(
-    app$active_module_element_text(
-      paste0(input_id, "-label")
-    ),
+    app$active_module_element_text(sprintf("%s-label", input_id)),
     "Append text"
   )
 
@@ -73,7 +70,6 @@ testthat::test_that("e2e: module with decorator UI and output is modified intera
 })
 
 testthat::test_that("e2e: module with decorator, where server fails,  shows shiny error message", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
   failing_decorator <- teal_transform_module(
     ui = function(id) {
@@ -104,7 +100,7 @@ testthat::test_that("e2e: module with decorator, where server fails,  shows shin
 
   app$expect_validation_error()
 
-  testthat::expect_setequal(
+  testthat::expect_identical(
     strsplit(app$active_module_element_text(input_id), "\n")[[1]],
     c(
       "Shiny error when executing the `data` module.",

tests/testthat/test-shinytest2-filter_panel.R

@@ -2,7 +2,6 @@ testthat::skip_if_not_installed("shinytest2")
 testthat::skip_if_not_installed("rvest")
 
 testthat::test_that("e2e: module content is updated when data is filtered in filter panel", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
   app <- TealAppDriver$new(
     data = simple_teal_data(),
@@ -30,7 +29,6 @@ testthat::test_that("e2e: module content is updated when data is filtered in fil
 })
 
 testthat::test_that("e2e: filtering a module-specific filter is reflected in other shared module", {
-  testthat::skip("chromium")
   skip_if_too_deep(5)
   app <- TealAppDriver$new(
     data = simple_teal_data(),
@@ -56,21 +54,15 @@ testthat::test_that("e2e: filtering a module-specific filter is reflected in oth
   )
 
   app$navigate_teal_tab("Module_2")
-
-  app$set_active_filter_selection("iris", "Species", c("setosa"))
+  app$set_active_filter_selection("iris", "Species", "setosa")
 
   app$navigate_teal_tab("Module_1")
-
-  testthat::expect_equal(
-    app$get_active_data_filters("iris")$Species,
-    c("setosa")
-  )
+  testthat::expect_equal(app$get_active_data_filters("iris")$Species, "setosa")
 
   app$stop()
 })
 
-testthat::test_that("e2e: filtering a module-specific filter is not refected in other unshared modules", {
-  testthat::skip("chromium")
+testthat::test_that("e2e: filtering a module-specific filter is not reflected in other unshared modules", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(
     data = simple_teal_data(),
@@ -93,12 +85,31 @@ testthat::test_that("e2e: filtering a module-specific filter is not refected in
   testthat::expect_setequal(app$get_active_data_filters("mtcars")$cyl, c("4", "6"))
 
   app$navigate_teal_tab("Module_2")
-
   app$set_active_filter_selection("mtcars", "cyl", c("4"))
 
   app$navigate_teal_tab("Module_1")
-
   testthat::expect_setequal(app$get_active_data_filters("mtcars")$cyl, c("4", "6"))
 
   app$stop()
 })
+
+testthat::test_that("e2e: filter panel UI can be collpased and expanded (`bslib` regression)", {
+  skip_if_too_deep(5)
+
+  data <- teal.data::teal_data(mtcars1 = mtcars, mtcars2 = data.frame(am = c(0, 1), test = c("a", "b")))
+  app <- TealAppDriver$new(data = data, modules = example_module())
+
+  # Visible by default
+  filterpanel_accordion_selector <- paste(
+    ".teal-filter-panel [id$=\\'filters-main_filter_accordion\\']",
+    "> .accordion-item > .accordion-collapse"
+  )
+  testthat::expect_true(app$is_visible(filterpanel_accordion_selector))
+  app$click(selector = paste(
+    ".teal-filter-panel [id$='filters-main_filter_accordion']",
+    "> .accordion-item > .accordion-header button"
+  ))
+  testthat::expect_false(app$is_visible(filterpanel_accordion_selector))
+
+  app$stop()
+})