Merge branch 'main' into pkg_test_env

* main:
  Replace crayon by cli (#399)
  ci: Use actions/upload-artifacts@v4 (#398)
  Change message load_timeout (#394)

DESCRIPTION

@@ -26,7 +26,7 @@ Imports:
     callr,
     checkmate (>= 2.0.0),
     chromote (>= 0.1.2),
-    crayon,
+    cli,
     fs,
     globals (>= 0.14.0),
     httr,

NAMESPACE

@@ -16,13 +16,13 @@ export(use_shinytest2)
 export(use_shinytest2_test)
 importFrom(R6,R6Class)
 importFrom(callr,process)
-importFrom(crayon,blue)
-importFrom(crayon,cyan)
-importFrom(crayon,green)
-importFrom(crayon,magenta)
-importFrom(crayon,make_style)
-importFrom(crayon,red)
-importFrom(crayon,silver)
+importFrom(cli,col_blue)
+importFrom(cli,col_cyan)
+importFrom(cli,col_green)
+importFrom(cli,col_magenta)
+importFrom(cli,col_red)
+importFrom(cli,col_silver)
+importFrom(cli,make_ansi_style)
 importFrom(rlang,"%||%")
 importFrom(rlang,":=")
 importFrom(rlang,list2)

NEWS.md

@@ -4,6 +4,10 @@
 
 * Add support for `$click()`ing `{bslib}`'s `input_task_button()` (#829).
 
+* Improved the error message when an app takes too long to start up (@LouisLeNezet, #394).
+
+* `{shinytest2}` now imports `{cli}` and no longer imports `{crayon}` (@olivroy, #399). 
+
 # shinytest2 0.3.2
 
 ## Bug / Improvements

R/app-driver-initialize.R

@@ -235,7 +235,7 @@ app_initialize <- function(self, private, ..., view = missing_arg()) {
         c(
           conditionMessage(e),
           "\n",
-          i = crayon::silver("You can inspect the failed AppDriver object via `rlang::last_error()$app`"),
+          i = cli::col_silver("You can inspect the failed AppDriver object via `rlang::last_error()$app`"),
           i = paste0("AppDriver logs:\n", logs),
           "\n"
         ),

R/app-driver-start.R

@@ -131,8 +131,15 @@ app_start_shiny <- function(
     Sys.sleep(0.2)
 
     if (i == max_i) {
-      app_abort(self, private, paste0(
-        "Cannot find shiny port number. Error lines found:\n",
+      app_abort(self, private, sprintf(
+        paste(
+          "The Shiny app failed to start up within %s second%s.",
+          "To increase the loading timeout, consult the documentation in `?AppDriver`",
+          "for the `load_timeout` argument of `AppDriver$new()`.",
+          "The app printed the following lines to stderr during start up:\n%s"
+        ),
+        load_timeout / 1000,
+        if (load_timeout == 1000) "" else "s",
         paste(err_lines, collapse = "\n")
       ))
     }

R/compare-screenshot-threshold.R

@@ -170,7 +170,7 @@ compare_screenshot_threshold <- function(
       " > `", threshold, "` (threshold)."),
       "*" = paste0("`old`:", old),
       "*" = paste0("`new`:", new),
-      "i" = crayon::silver("(To remove this message, increase `threshold`, or set `quiet = TRUE`)")
+      "i" = cli::col_silver("(To remove this message, increase `threshold`, or set `quiet = TRUE`)")
     ))
   }
 

R/shinytest2-logs.R

@@ -5,14 +5,14 @@ print.shinytest2_log <- function(x, ...) {
 }
 
 #' @export
-#' @importFrom crayon blue magenta cyan green red silver make_style
+#' @importFrom cli col_blue col_magenta col_cyan col_green col_red col_silver make_ansi_style
 format.shinytest2_log <- function(x, ...) {
 
   get_color <- function(location, level) {
     switch(as.character(location),
-      shiny = switch(level, stderr = magenta, force),
-      chromote = switch(level, throw = red, error = red, cyan),
-      shinytest2 = switch(level, green)
+      shiny = switch(level, stderr = col_magenta, force),
+      chromote = switch(level, throw = col_red, error = col_red, col_cyan),
+      shinytest2 = switch(level, col_green)
     )
   }
 

actions/test-app/action.yml

@@ -58,7 +58,7 @@ runs:
 
     - name: Upload snapshots
       if: inputs.upload-snapshots != 'false'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ runner.os }}-r${{ steps.test-app.outputs.r-version }}-testthat-snapshots
         # path: ${{ inputs.app-dir }}/tests*/testthat/_snaps