1.1.2.69

urniaz · Oct 25, 2024 · 22ebfd4 · 22ebfd4
1 parent fcbb68b
commit 22ebfd4
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ TBA
 
 Test are implemented as *continuous integration* by CircleCI. Continuous integration is a DevOps software development practice where code changes are regularly merge into a central repository, after which automated builds and tests are run.
 
-The *source* of tests covering the code of the package are available in [tests](https://github.com/urniaz/ShinyWizard/blob/master/tests) folder of the repository.
+The *source* of tests covering the code of the package are available in [tests](https://github.com/urniaz/ShinyWizard/blob/master/tests) folder of the repository.  
 
 
 ## 4. How to cite

diff --git a/ShinyWizard/DESCRIPTION b/ShinyWizard/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ShinyWizard
 Title: An Interactive Wizard to Design, Build, and Deploy R Packages Demo Presentation
-Version: 1.1.1.48
+Version: 1.1.2.69
 Authors@R: 
     person("Rafal", "Urniaz", , "rafal.urniaz@cantab.net", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-0192-2165"))
@@ -9,19 +9,7 @@ License: GPL (>= 3)
 Encoding: UTF-8
 Imports:
     base,
-    shiny,
-    rstudioapi,
-    devtools,
-    shiny,
-    shinythemes,
-    shinydashboard,
-    shinyjs,
-    yaml,
-    readr,
-    stringr,
-    shinyWidgets,
-    bslib,
-    shinytest2
+    rstudioapi
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.2
 Suggests: 

diff --git a/ShinyWizard/inst/source/global.R b/ShinyWizard/inst/source/global.R
@@ -11,11 +11,13 @@ config$TempProjPathTabs <- paste0(tempdir(),"/SWTempProj/tabs/")
 # Package names
 packages <- c("devtools", "shiny", "shinythemes", "shinydashboard", "shinyjs", "yaml", "readr", "stringr", "shinyWidgets", "bslib", "shinytest2")
 
-# # Install packages not yet installed
-# installed_packages <- packages %in% rownames(installed.packages())
-# if (any(installed_packages == FALSE)) {
-#   install.packages(packages[!installed_packages])
-# }
+# Try loading packages
+installedPackages <- find.package(packages)
+
+# Install packages not yet installed
+if (!(length(installedPackages) == length(packages))){
+  install.packages(packages)
+}
 
 # Packages loading
 invisible(lapply(packages, library, character.only = TRUE))

diff --git a/ShinyWizard/inst/source/tabs/tab4/server.R b/ShinyWizard/inst/source/tabs/tab4/server.R
@@ -3,7 +3,7 @@
 
 output$DownloadShinyWizardZIP <- downloadHandler(
   filename = function() {
-    paste("ShinyWizard.zip", sep="") # format(Sys.time(), "%d-%m-%y-%X"), ".zip", sep="")
+    paste("ShinyWizard-", format(Sys.time(), "%d-%m-%y-%X"), ".zip", sep="")
   },
   content = function(file) {
     # change wd

diff --git a/ShinyWizard/tests/testthat/_snaps/shinytest2.md b/ShinyWizard/tests/testthat/_snaps/shinytest2.md
diff --git a/ShinyWizard/tests/testthat/_snaps/shinytest2/source-001-ShinyWizard.new.zip b/ShinyWizard/tests/testthat/_snaps/shinytest2/source-001-ShinyWizard.new.zip
diff --git a/ShinyWizard/tests/testthat/_snaps/shinytest2/source-001-ShinyWizard.zip b/ShinyWizard/tests/testthat/_snaps/shinytest2/source-001-ShinyWizard.zip
diff --git a/ShinyWizard/tests/testthat/test-ShinyWizard.R b/ShinyWizard/tests/testthat/test-ShinyWizard.R
@@ -0,0 +1,41 @@
+library(shinytest2)
+
+test_that("{Test ShinyWizard} recording: source", {
+  # App Dir
+  appDir <- paste0(base::system.file("", package = "ShinyWizard"), "inst/source")
+  # Skip on app_dir temporary folder eg. check rather than test()
+  testthat::skip_if(dir.exists(appDir) == FALSE)
+  # Test
+  app <- AppDriver$new(app_dir = appDir, name = "source", height = 731, width = 1139)
+  # ->
+  app$click("NavBar-go_1_2")
+  app$set_inputs(`tab2-AppTitleInput` = "Shiny Wizard2")
+  app$set_inputs(`tab2-AppSubTitleInput` = "Design, build, deploy!2")
+  app$set_inputs(`tab2-LogoFilePathInput` = "img/logo2.png")
+  app$set_inputs(`tab2-FooterTextInput` = "2")
+  app$set_inputs(`tab2-shinytheme-selector` = "cyborg")
+  app$click("NavBar-go_2_3")
+  app$click("tab3-newTab")
+  app$set_inputs(`tab3-ui1` = "# --- Navigation ---\n# TabName: Tab0\n# TabIcon: file\n# --- Next/Prev buttons\n# ShowButtons: TRUE\n# ButtonsAlignment: center\n# --- Info ---\n# InfoTitle: Tab0\n# InfoMessage: Info about tab\nfluidPage(\nselectInput(ns(\"dataset\"), label = \"Dataset\", choices = ls(\"package:datasets\")),\n                                                          verbatimTextOutput(ns(\"summary\")),\n                                                          tableOutput(ns(\"table\"))\n                                                          )")
+  app$set_inputs(`tab3-server1` = "  output$summary <- renderPrint({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          summary(dataset)\n                                                          })\n  \n                                                          output$table <- renderTable({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          dataset\n                                                          })")
+  app$set_inputs(`tab3-config1` = " # --- Navigation ---\n                     # TabName: Tab Name\n                      # TabIcon: paper\n                         # --- Next/Prev buttons\n                        # ShowButtons: TRUE\n                     # --- Info ---\n                    # InfoTitle: Information\n                      # InfoMessage: Some info text")
+  app$set_inputs(`tab3-EditTabs` = "1")
+  app$click("tab3-newTab")
+  app$set_inputs(`tab3-ui2` = "# --- Navigation ---\n# TabName: Tab1\n# TabIcon: file\n# --- Next/Prev buttons\n# ShowButtons: TRUE\n# ButtonsAlignment: center\n# --- Info ---\n# InfoTitle: Tab1\n# InfoMessage: Info about tab\nfluidPage(\nselectInput(ns(\"dataset\"), label = \"Dataset\", choices = ls(\"package:datasets\")),\n                                                          verbatimTextOutput(ns(\"summary\")),\n                                                          tableOutput(ns(\"table\"))\n                                                          )")
+  app$set_inputs(`tab3-server2` = "  output$summary <- renderPrint({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          summary(dataset)\n                                                          })\n  \n                                                          output$table <- renderTable({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          dataset\n                                                          })")
+  app$set_inputs(`tab3-config2` = " # --- Navigation ---\n                     # TabName: Tab Name\n                      # TabIcon: paper\n                         # --- Next/Prev buttons\n                        # ShowButtons: TRUE\n                     # --- Info ---\n                    # InfoTitle: Information\n                      # InfoMessage: Some info text")
+  app$set_inputs(`tab3-EditTabs` = "2")
+  app$click("tab3-newTab")
+  app$set_inputs(`tab3-ui3` = "# --- Navigation ---\n# TabName: Tab2\n# TabIcon: file\n# --- Next/Prev buttons\n# ShowButtons: TRUE\n# ButtonsAlignment: center\n# --- Info ---\n# InfoTitle: Tab2\n# InfoMessage: Info about tab\nfluidPage(\nselectInput(ns(\"dataset\"), label = \"Dataset\", choices = ls(\"package:datasets\")),\n                                                          verbatimTextOutput(ns(\"summary\")),\n                                                          tableOutput(ns(\"table\"))\n                                                          )")
+  app$set_inputs(`tab3-server3` = "  output$summary <- renderPrint({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          summary(dataset)\n                                                          })\n  \n                                                          output$table <- renderTable({\n                                                          dataset <- get(input$dataset, \"package:datasets\")\n                                                          dataset\n                                                          })")
+  app$set_inputs(`tab3-config3` = " # --- Navigation ---\n                     # TabName: Tab Name\n                      # TabIcon: paper\n                         # --- Next/Prev buttons\n                        # ShowButtons: TRUE\n                     # --- Info ---\n                    # InfoTitle: Information\n                      # InfoMessage: Some info text")
+  app$set_inputs(`tab3-EditTabs` = "3")
+  app$set_inputs(`tab3-EditTabs` = "2")
+  app$click("tab3-removeTab")
+  app$set_inputs(`tab3-DelTabConfirmation` = character(0), allow_no_input_binding_ = TRUE)
+  app$set_inputs(`tab3-DelTabConfirmation` = TRUE, allow_no_input_binding_ = TRUE)
+  app$click("NavBar-go_3_4")
+  app$set_window_size(width = 1139, height = 731)
+  # <-
+  app$expect_unique_names()
+})
diff --git a/ShinyWizard/tests/testthat/test-shinytest2.R b/ShinyWizard/tests/testthat/test-shinytest2.R