ci: fix the ci on windows

ArthurData · Jul 31, 2024 · 4b67a05 · 4b67a05
1 parent 4edccad
commit 4b67a05
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 46 deletions.
diff --git a/R/sendconfetti.R b/R/sendconfetti.R
@@ -27,11 +27,7 @@
 #' @examples
 #' if (interactive()) {
 #'   library(shiny)
-#'   
-#'   if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-#'     testthat::skip()
-#'   }
-#'   
+#'
 #'   shinyApp(
 #'     ui = fluidRow(
 #'       useConfetti(),

diff --git a/R/sendfireworks.R b/R/sendfireworks.R
@@ -17,10 +17,6 @@
 #' @examples
 #' if (interactive()) {
 #'   library(shiny)
-#'
-#'   if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-#'     testthat::skip()
-#'   }
 #'   
 #'   shinyApp(
 #'     ui = fluidRow(

diff --git a/dev/flat_minimal.Rmd b/dev/flat_minimal.Rmd
@@ -123,11 +123,7 @@ sendConfetti <- function(particle_count = 50,
 ```{r example-sendConfetti}
 if (interactive()) {
   library(shiny)
-  
-  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-    testthat::skip()
-  }
-  
+
   shinyApp(
     ui = fluidRow(
       useConfetti(),
@@ -149,27 +145,31 @@ if (interactive()) {
 
 ```{r tests-sendConfetti}
 test_that("sendConfetti works", {
+  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
+    testthat::skip()
+  }
+
   library(shinytest2)
-  
+
   expect_true(inherits(sendConfetti, "function"))
-  
+
   app <- shinytest2::AppDriver$new(
     system.file("shiny", "test", "confetti", "app.R", package = "confetti")
   )
   expect_equal(app$get_value(input = "go")[[1]], 0)
   expect_equal(app$get_value(input = "sentFireworks"), 0)
   expect_equal(app$get_value(input = "sentConfetti"), 0)
-  
+
   app$click("go")
   html <- app$get_html("canvas")
   expect_equal(
-    html, 
+    html,
     "<canvas style=\"position: fixed; top: 0px; left: 0px; pointer-events: none; z-index: 100;\" width=\"992\" height=\"1323\"></canvas>"
   )
   expect_equal(app$get_value(input = "go")[[1]], 1)
   expect_equal(app$get_value(input = "sentConfetti"), 1)
   expect_equal(app$get_value(input = "sentFireworks"), 0)
-  
+
   app$click("go")
   expect_equal(app$get_value(input = "go")[[1]], 2)
   expect_equal(app$get_value(input = "sentConfetti"), 2)
@@ -215,10 +215,6 @@ sendfireworks <- function(duration,
 ```{r example-sendfireworks}
 if (interactive()) {
   library(shiny)
-
-  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-    testthat::skip()
-  }
   
   shinyApp(
     ui = fluidRow(
@@ -247,6 +243,10 @@ if (interactive()) {
 test_that("sendfireworks works", {
   library(shinytest2)
   
+  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
+    testthat::skip()
+  }
+  
   app <- shinytest2::AppDriver$new(
     system.file("shiny", "test", "fireworks", "app.R", package = "confetti")
   )

diff --git a/man/sendConfetti.Rd b/man/sendConfetti.Rd
diff --git a/man/sendfireworks.Rd b/man/sendfireworks.Rd
diff --git a/tests/testthat/test-sendconfetti.R b/tests/testthat/test-sendconfetti.R
@@ -1,27 +1,31 @@
 # WARNING - Generated by {fusen} from dev/flat_minimal.Rmd: do not edit by hand
 
 test_that("sendConfetti works", {
+  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
+    testthat::skip()
+  }
+
   library(shinytest2)
-  
+
   expect_true(inherits(sendConfetti, "function"))
-  
+
   app <- shinytest2::AppDriver$new(
     system.file("shiny", "test", "confetti", "app.R", package = "confetti")
   )
   expect_equal(app$get_value(input = "go")[[1]], 0)
   expect_equal(app$get_value(input = "sentFireworks"), 0)
   expect_equal(app$get_value(input = "sentConfetti"), 0)
-  
+
   app$click("go")
   html <- app$get_html("canvas")
   expect_equal(
-    html, 
+    html,
     "<canvas style=\"position: fixed; top: 0px; left: 0px; pointer-events: none; z-index: 100;\" width=\"992\" height=\"1323\"></canvas>"
   )
   expect_equal(app$get_value(input = "go")[[1]], 1)
   expect_equal(app$get_value(input = "sentConfetti"), 1)
   expect_equal(app$get_value(input = "sentFireworks"), 0)
-  
+
   app$click("go")
   expect_equal(app$get_value(input = "go")[[1]], 2)
   expect_equal(app$get_value(input = "sentConfetti"), 2)

diff --git a/tests/testthat/test-sendfireworks.R b/tests/testthat/test-sendfireworks.R
@@ -3,6 +3,10 @@
 test_that("sendfireworks works", {
   library(shinytest2)
 
+  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
+    testthat::skip()
+  }
+
   app <- shinytest2::AppDriver$new(
     system.file("shiny", "test", "fireworks", "app.R", package = "confetti")
   )

diff --git a/vignettes/send-confetti.Rmd b/vignettes/send-confetti.Rmd
@@ -38,11 +38,7 @@ useConfetti()
 ```{r example-sendConfetti}
 if (interactive()) {
   library(shiny)
-  
-  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-    testthat::skip()
-  }
-  
+
   shinyApp(
     ui = fluidRow(
       useConfetti(),
@@ -69,10 +65,6 @@ if (interactive()) {
 ```{r example-sendfireworks}
 if (interactive()) {
   library(shiny)
-
-  if (shinytest2:::on_ci() && shinytest2:::is_windows()) {
-    testthat::skip()
-  }
   
   shinyApp(
     ui = fluidRow(