Middleware unit tests

- Add more unit tests for middleware
- Remove cli from `check_suggests` (already a dependency)

R/middleware.R

@@ -16,17 +16,19 @@ middleware <- function(engine) {
             }) |>
             # the dummy path is needed for pinging the server from hotwater
             plumber::pr_get("/__hotwater__", function() "running") |>
-            plumber::pr_hook("postserialize", function(value) {
-                if (grepl("text/html", value$headers[["Content-Type"]])) {
-                    value$headers[["Cache-Control"]] <- "no-cache"
-                    value$body <- c(value$body, js) |>
-                        paste0(collapse = "\n")
-                }
-                value
-            })
+            plumber::pr_hook("postserialize", postserialise_hotwater)
     }
 }
 
+postserialise_hotwater <- function(value) {
+    if (grepl("text/html", value$headers[["Content-Type"]])) {
+        value$headers[["Cache-Control"]] <- "no-cache"
+        value$body <- c(value$body, js) |>
+            paste0(collapse = "\n")
+    }
+    value
+}
+
 publish_browser_reload <- function(engine) {
     # at the moment, the message itself is largely meaningless because we're faking the
     # protocol on the javascript side of things

R/script.R

@@ -48,9 +48,13 @@ uninstall_hotwater <- function(install_folder = "~/.local/bin/") {
     }
 }
 
-#' WIP
+#' Check suggested packages for CLI usage
+#'
+#' The {docopt} and {remotes} packages are required to run hotwater from the command line.
+#'
+#' @noRd
 check_suggests <- function() {
-    suggests <- c("docopt", "cli", "remotes")
+    suggests <- c("docopt", "remotes")
     lapply(
         suggests,
         function(suggestion) {
@@ -68,7 +72,8 @@ check_suggests <- function() {
     invisible()
 }
 
-#' WIP
+#' Run hotwater as a bash script
+#' @noRd
 run_cli <- function() {
     doc <- "hotwater
 
@@ -83,18 +88,18 @@ run_cli <- function() {
         -f FILE --file=FILE         plumber path (required)
         -d DIRS --dirs=DIRS         extra directories
         -p PORT --port=PORT         plumber port
-        -s SERVER --host=SERVER     plumber host
+        -s SERVER --server=SERVER   plumber host
     "
 
     args <- docopt::docopt(
         doc,
         version = as.character(utils::packageVersion("hotwater"))
     )
 
-    hotwater::run(
+    run(
         path = args$file,
         dirs = args$dirs,
         port = if (is.null(args$port)) NULL else as.numeric(args$port),
-        host = args$host
+        host = args$server
     )
 }

tests/testthat/test-middleware.R

@@ -7,5 +7,33 @@ test_that("middleware injection works", {
         )
     )
     expect_snapshot(injection(dummy_engine))
+    fn <- middleware(dummy_engine)
+    router <- fn(plumber::pr())
+    expect_s3_class(router$routes$`__hotwater__`, "PlumberEndpoint")
+    expect_identical(
+        router$`.__enclos_env__`$private$hooks$postserialize[[1L]],
+        postserialise_hotwater
+    )
 })
 
+test_that("is_plumber_running works", {
+    dummy_engine <- list(
+        config = list(
+            port = httpuv::randomPort()
+        )
+    )
+    router <- callr::r_bg(
+        function(port) {
+            plumber::pr(
+                system.file("examples", "plumber.R", package = "hotwater")
+            ) |>
+                plumber::pr_run(port = port)
+        },
+        args = list(
+            port = dummy_engine$config$port
+        )
+    )
+    Sys.sleep(3L) # seems silly but works...
+    expect_true(is_plumber_running(dummy_engine))
+    router$kill_tree()
+})