Add test for Router.notFound

fsbolero · Aug 22, 2023 · c9f92bf · c9f92bf
1 parent 18cc2a1
commit c9f92bf
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 13 deletions.
diff --git a/tests/Remoting.Client/Main.fs b/tests/Remoting.Client/Main.fs
@@ -144,9 +144,11 @@ let router : Router<Page, Model, Message> =
             | Custom i -> $"/custom/{i}"
         setRoute = fun s ->
             match s.Trim('/').Split('/') with
-            | [|""|] -> Some (SetPage Home)
-            | [|"custom"; i|] -> Some (SetPage (Custom (int i)))
+            | [|""|] -> Some Home
+            | [|"custom"; i|] -> Some (Custom (int i))
             | _ -> None
+        makeMessage = SetPage
+        notFound = None
     }
 
 type Tpl = Template<"main.html">

diff --git a/tests/Unit.Client/Routing.fs b/tests/Unit.Client/Routing.fs
@@ -26,6 +26,7 @@ open Elmish
 
 type Page =
     | [<EndPoint "/">] Home
+    | [<EndPoint "/not-found">] NotFound
     | [<EndPoint "/no-arg">] NoArg
     | [<EndPoint "/with-arg">] WithArg of string
     | [<EndPoint "/with-args">] WithArgs of string * int
@@ -80,7 +81,9 @@ let update msg model =
     | SetPage p -> { model with page = p }
 
 let router =
-    try Router.infer SetPage (fun m -> m.page)
+    try
+        Router.infer SetPage (fun m -> m.page)
+        |> Router.withNotFound NotFound
     with e ->
         eprintfn $"ROUTER ERROR: {e}"
         reraise()
@@ -93,6 +96,7 @@ let innerPageClass = function
 
 let rec pageClass = function
     | Home -> "home"
+    | NotFound -> "notfound"
     | NoArg -> "noarg"
     | WithArg x -> $"witharg-{x}"
     | WithArgs(x, y) -> $"withargs-{x}-{y}"
@@ -192,6 +196,11 @@ let view model dispatch =
                 on.click (fun _ -> dispatch (SetPage page))
                 url
             }
+        a {
+            attr.``class`` "link-notfound"
+            attr.href "/invalid-url"
+            "/not-found"
+        }
         span { attr.``class`` "current-page"; $"{model.page}" }
     }
 

diff --git a/tests/Unit/Fixture.fs b/tests/Unit/Fixture.fs
@@ -152,7 +152,7 @@ and NodeFixture(parent: unit -> IWebElement, by: By) =
 
     /// Assert that the given value is eventually non-null.
     member this.EventuallyNotNull(expr: Expr<'T>) =
-        this.Eventually <@ isNotNull %expr @>
+        this.Wait(fun () -> eval expr)
 
 [<AutoOpen>]
 module Extensions =

diff --git a/tests/Unit/Tests/Html.fs b/tests/Unit/Tests/Html.fs
@@ -45,29 +45,29 @@ module Html =
         inp.Clear()
 
         inp.SendKeys("ab")
-        elt.EventuallyNotNull <@ elt.ByClass("condBoolIs2") @>
+        elt.EventuallyNotNull <@ elt.ByClass("condBoolIs2") @> |> ignore
         testNull <@ elt.ByClass("condBoolIsNot2") @>
 
         inp.SendKeys("c")
-        elt.EventuallyNotNull <@ elt.ByClass("condBoolIsNot2") @>
+        elt.EventuallyNotNull <@ elt.ByClass("condBoolIsNot2") @> |> ignore
         testNull <@ elt.ByClass("condBoolIs2") @>
 
     [<Test>]
     let ``Union cond reacts to events``() =
         let inp = elt.ByClass("condUnionInput")
         inp.Clear()
 
-        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsEmpty") @>
+        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsEmpty") @> |> ignore
         testNull <@ elt.ByClass("condUnionIsOne") @>
         testNull <@ elt.ByClass("condUnionIsMany") @>
 
         inp.SendKeys("a")
-        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsOne") @>
+        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsOne") @> |> ignore
         testNull <@ elt.ByClass("condUnionIsEmpty") @>
         testNull <@ elt.ByClass("condUnionIsMany") @>
 
         inp.SendKeys("b")
-        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsMany") @>
+        elt.EventuallyNotNull <@ elt.ByClass("condUnionIsMany") @> |> ignore
         testNull <@ elt.ByClass("condUnionIsOne") @>
         testNull <@ elt.ByClass("condUnionIsEmpty") @>
 
@@ -77,7 +77,7 @@ module Html =
         inp.Clear()
 
         inp.SendKeys("ABC")
-        elt.EventuallyNotNull <@ elt.ByClass("forEachIsA") @>
+        elt.EventuallyNotNull <@ elt.ByClass("forEachIsA") @> |> ignore
         testNotNull <@ elt.ByClass("forEachIsB") @>
         testNotNull <@ elt.ByClass("forEachIsC") @>
 
@@ -92,7 +92,7 @@ module Html =
         inp.Clear()
 
         inp.SendKeys("ABC")
-        elt.EventuallyNotNull <@ elt.ByClass("forLoopIsA") @>
+        elt.EventuallyNotNull <@ elt.ByClass("forLoopIsA") @> |> ignore
         testNotNull <@ elt.ByClass("forLoopIsB") @>
         testNotNull <@ elt.ByClass("forLoopIsC") @>
 

diff --git a/tests/Unit/Tests/Routing.fs b/tests/Unit/Tests/Routing.fs
@@ -30,15 +30,23 @@ module Routing =
     [<Test; TestCaseSource("links"); NonParallelizable>]
     let ``Click link``(linkCls: string, url: string, print: string) =
         elt.ByClass("link-" + linkCls).Click()
-        elt.Eventually <@ elt.ByClass("current-page").Text = print @>
+        let currentPage = elt.EventuallyNotNull <@ elt.ByClass("current-page") @>
+        elt.Eventually <@ currentPage.Text = print @>
         test <@ WebFixture.Driver.Url = WebFixture.Url + url @>
 
     [<Test; TestCaseSource("links"); NonParallelizable>]
     let ``Set by model``(linkCls: string, url: string, print: string) =
         elt.ByClass("btn-" + linkCls).Click()
-        elt.Eventually <@ elt.ByClass("current-page").Text = print @>
+        let currentPage = elt.EventuallyNotNull <@ elt.ByClass("current-page") @>
+        elt.Eventually <@ currentPage.Text = print @>
         test <@ WebFixture.Driver.Url = WebFixture.Url + url @>
 
+    [<Test; NonParallelizable>]
+    let ``Not found``() =
+        elt.ByClass("link-notfound").Click()
+        let currentPage = elt.EventuallyNotNull <@ elt.ByClass("current-page") @>
+        elt.Eventually <@ currentPage.Text = "NotFound" @>
+
     let failingRouter<'T> (expectedError: UnionCaseInfo[] -> InvalidRouterKind) =
         TestCaseData(
             (fun () -> Router.infer<'T, _, _> id id |> ignore),