testing

crates/bsnext_input/src/route_cli.rs

@@ -1,5 +1,5 @@
 use crate::path_def::PathDef;
-use crate::route::{DelayKind, DelayOpts, DirRoute, Route, RouteKind};
+use crate::route::{DelayKind, DelayOpts, DirRoute, Opts, Route, RouteKind};
 use clap::Parser;
 use shell_words::split;
 
@@ -35,17 +35,15 @@ impl TryInto<Route> for RouteCli {
                 dir,
                 path,
                 delay: ms,
-            } => {
-                let mut route = Route {
-                    path: PathDef::try_new(path)?,
-                    kind: RouteKind::Dir(DirRoute { dir, base: None }),
+            } => Route {
+                path: PathDef::try_new(path)?,
+                kind: RouteKind::Dir(DirRoute { dir, base: None }),
+                opts: Opts {
+                    delay: ms.map(|ms| DelayOpts::Delay(DelayKind::Ms(ms))),
                     ..std::default::Default::default()
-                };
-                if let Some(ms) = ms {
-                    route.opts.delay = Some(DelayOpts::Delay(DelayKind::Ms(ms)))
-                }
-                route
-            }
+                },
+                ..std::default::Default::default()
+            },
         })
     }
 }
@@ -77,19 +75,17 @@ mod test {
         let input = "bslive serve-dir --path=/ --dir=examples/basic/public";
         let as_args = split(input)?;
         let parsed = RouteCli::try_parse_from(as_args)?;
-        let as_route: Result<Route, _> = parsed.try_into();
-        dbg!(&as_route);
-        // assert_debug_snapshot!(parsed);
+        let as_route: Route = parsed.try_into().unwrap();
+        insta::assert_debug_snapshot!(as_route);
         Ok(())
     }
     #[test]
     fn test_serve_dir_delay() -> anyhow::Result<()> {
         let input = "bslive serve-dir --path=/ --dir=examples/basic/public --delay=1000";
         let as_args = split(input)?;
         let parsed = RouteCli::try_parse_from(as_args)?;
-        let as_route: Result<Route, _> = parsed.try_into();
-        dbg!(&as_route);
-        // assert_debug_snapshot!(parsed);
+        let as_route: Route = parsed.try_into().unwrap();
+        insta::assert_debug_snapshot!(as_route);
         Ok(())
     }
 }

crates/bsnext_input/src/snapshots/bsnext_input__route_cli__test__serve_dir.snap

@@ -1,10 +1,29 @@
 ---
 source: crates/bsnext_input/src/route_cli.rs
-expression: parsed
+expression: as_route
 ---
-RouteCli {
-    command: ServeDir {
-        path: "/",
-        dir: "examples/basic/public",
+Route {
+    path: PathDef {
+        inner: "/",
     },
+    kind: Dir(
+        DirRoute {
+            dir: "examples/basic/public",
+            base: None,
+        },
+    ),
+    opts: Opts {
+        cors: None,
+        delay: None,
+        watch: Bool(
+            true,
+        ),
+        inject: Bool(
+            true,
+        ),
+        headers: None,
+        cache: Prevent,
+        compression: None,
+    },
+    fallback: None,
 }

crates/bsnext_input/src/snapshots/bsnext_input__route_cli__test__serve_dir_delay.snap

@@ -0,0 +1,35 @@
+---
+source: crates/bsnext_input/src/route_cli.rs
+expression: as_route
+---
+Route {
+    path: PathDef {
+        inner: "/",
+    },
+    kind: Dir(
+        DirRoute {
+            dir: "examples/basic/public",
+            base: None,
+        },
+    ),
+    opts: Opts {
+        cors: None,
+        delay: Some(
+            Delay(
+                Ms(
+                    1000,
+                ),
+            ),
+        ),
+        watch: Bool(
+            true,
+        ),
+        inject: Bool(
+            true,
+        ),
+        headers: None,
+        cache: Prevent,
+        compression: None,
+    },
+    fallback: None,
+}