keep shinytest2 and rvest as a soft dependency

insightsengineering · Jul 4, 2024 · 6ac7aea · 6ac7aea
1 parent 28ee3c6
commit 6ac7aea
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 5 deletions.
diff --git a/R/TealAppDriver.R b/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

diff --git a/R/validate_inputs.R b/R/validate_inputs.R
@@ -31,7 +31,7 @@
 #'
 #' @seealso [`shinyvalidate::InputValidator`], [`shiny::validate`]
 #'
-#' @examples
+#' @examplesIf require("shinyvalidate")
 #' library(shiny)
 #' library(shinyvalidate)
 #'

diff --git a/tests/testthat/helper-shinytest2.R b/tests/testthat/helper-shinytest2.R
@@ -1,6 +1,3 @@
-library(shinytest2)
-library(rvest)
-
 simple_teal_data <- function() {
   data <- within(teal_data(), {
     iris <- iris

diff --git a/tests/testthat/test-shinytest2-filter_panel.R b/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(

diff --git a/tests/testthat/test-shinytest2-init.R b/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(

diff --git a/tests/testthat/test-shinytest2-landing_popup.R b/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(

diff --git a/tests/testthat/test-shinytest2-module_bookmark_manager.R b/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(

diff --git a/tests/testthat/test-shinytest2-modules.R b/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") {

diff --git a/tests/testthat/test-shinytest2-reporter.R b/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(

diff --git a/tests/testthat/test-shinytest2-show-rcode.R b/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(

diff --git a/tests/testthat/test-shinytest2-teal_data_module.R b/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(

diff --git a/tests/testthat/test-shinytest2-teal_slices.R b/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(

diff --git a/tests/testthat/test-shinytest2-utils.R b/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(

diff --git a/tests/testthat/test-shinytest2-wunder_bar.R b/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(