Merge branch 'main' into propagations-august-2024

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.2
+    rev: v0.4.3
     hooks:
       - id: style-files
         name: Style code with `styler`

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: teal
 Title: Exploratory Web Apps for Analyzing Clinical Trials Data
-Version: 0.15.2.9047
-Date: 2024-07-03
+Version: 0.15.2.9048
+Date: 2024-08-05
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9533-457X")),

NEWS.md

@@ -1,4 +1,4 @@
-# teal 0.15.2.9047
+# teal 0.15.2.9048
 
 ### Enhancement
 * Provided progress bar for modules loading and data filtering during teal app startup.

R/TealAppDriver.R

@@ -9,7 +9,15 @@
 #'
 TealAppDriver <- R6::R6Class( # nolint: object_name.
   "TealAppDriver",
-  inherit = shinytest2::AppDriver,
+  inherit = {
+    if (!requireNamespace("shinytest2", quietly = TRUE)) {
+      stop("Please install 'shinytest2' package to use this class.")
+    }
+    if (!requireNamespace("rvest", quietly = TRUE)) {
+      stop("Please install 'rvest' package to use this class.")
+    }
+    shinytest2::AppDriver
+  },
   # public methods ----
   public = list(
     #' @description

R/validate_inputs.R

@@ -31,7 +31,7 @@
 #'
 #' @seealso [`shinyvalidate::InputValidator`], [`shiny::validate`]
 #'
-#' @examples
+#' @examplesIf require("shinyvalidate")
 #' library(shiny)
 #' library(shinyvalidate)
 #'

tests/testthat/helper-shinytest2.R

@@ -1,6 +1,3 @@
-library(shinytest2)
-library(rvest)
-
 simple_teal_data <- function() {
   data <- within(teal_data(), {
     iris <- iris

tests/testthat/test-shinytest2-filter_panel.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: module content is updated when a data is filtered in filter panel", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-init.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: teal app initializes with no errors", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-landing_popup.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: teal app with landing_popup_module initializes with no errors", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-module_bookmark_manager.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("bookmark_manager_button is not rendered by default", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-modules.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: the module server logic is only triggered when the teal module becomes active", {
   skip_if_too_deep(5)
   value_export_module <- function(label = "custom module") {

tests/testthat/test-shinytest2-reporter.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: reporter tab is created when a module has reporter", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-show-rcode.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: teal app initializes with Show R Code modal", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-teal_data_module.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: teal_data_module will have a delayed load of datasets", {
   skip_if_too_deep(5)
   tdm <- teal_data_module(

tests/testthat/test-shinytest2-teal_slices.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: teal_slices filters are initialized when global filters are created", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-utils.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("e2e: show/hide hamburger works as expected", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-shinytest2-wunder_bar.R

@@ -1,3 +1,6 @@
+testthat::skip_if_not_installed("shinytest2")
+testthat::skip_if_not_installed("rvest")
+
 testthat::test_that("wunder_bar_srv clicking filter icon opens filter-manager modal", {
   skip_if_too_deep(5)
   app <- TealAppDriver$new(

tests/testthat/test-validate_inputs.R

@@ -11,6 +11,8 @@ testthat::test_that("invalid arguments raise errors", {
 
 
 testthat::test_that("disabled validators raise warnings (individual validators)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv1 <- shinyvalidate::InputValidator$new()
     iv1$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -36,6 +38,8 @@ testthat::test_that("disabled validators raise warnings (individual validators)"
 
 
 testthat::test_that("disabled validators raise warnings (validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv1 <- shinyvalidate::InputValidator$new()
     iv1$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -61,6 +65,8 @@ testthat::test_that("disabled validators raise warnings (validator list)", {
 
 
 testthat::test_that("disabled validators raise warnings (nested validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv1 <- shinyvalidate::InputValidator$new()
     iv1$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -86,6 +92,8 @@ testthat::test_that("disabled validators raise warnings (nested validator list)"
 
 
 testthat::test_that("valid inputs produce desired output (individual validators)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -114,6 +122,8 @@ testthat::test_that("valid inputs produce desired output (individual validators)
 
 
 testthat::test_that("valid inputs produce desired output (validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -142,6 +152,8 @@ testthat::test_that("valid inputs produce desired output (validator list)", {
 
 
 testthat::test_that("valid inputs produce desired output (nested validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -170,6 +182,8 @@ testthat::test_that("valid inputs produce desired output (nested validator list)
 
 
 testthat::test_that("invalid inputs raise errors in output (individual validators)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -209,6 +223,8 @@ testthat::test_that("invalid inputs raise errors in output (individual validator
 
 
 testthat::test_that("invalid inputs raise errors in output (validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -247,6 +263,8 @@ testthat::test_that("invalid inputs raise errors in output (validator list)", {
 })
 
 testthat::test_that("invalid inputs raise errors in output (nested validator list)", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -286,6 +304,8 @@ testthat::test_that("invalid inputs raise errors in output (nested validator lis
 
 
 testthat::test_that("error message is formatted properly", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))
@@ -483,6 +503,8 @@ testthat::test_that("error message is formatted properly", {
 
 
 testthat::test_that("different validation modes produce proper messages", {
+  testthat::skip_if_not_installed("shinyvalidate")
+
   server <- function(input, output, session) {
     iv <- shinyvalidate::InputValidator$new()
     iv$add_rule("letter", shinyvalidate::sv_in_set(LETTERS, "choose a capital letter"))