From 312adf807d25b7b4e08859fc1e315b9d788ed623 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Mon, 27 Feb 2023 20:50:34 -0500 Subject: [PATCH] Remove prior test projects --- .../Giraffe.Htmx.Common.Tests.fsproj | 30 - src/Common.Tests/Program.fs | 1 - src/Common.Tests/Tests.fs | 35 -- src/Giraffe.Htmx.sln | 18 - src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj | 32 - src/Htmx.Tests/Program.fs | 1 - src/Htmx.Tests/Tests.fs | 372 ----------- .../Giraffe.ViewEngine.Htmx.Tests.fsproj | 31 - src/ViewEngine.Htmx.Tests/Program.fs | 1 - src/ViewEngine.Htmx.Tests/Tests.fs | 583 ------------------ 10 files changed, 1104 deletions(-) delete mode 100644 src/Common.Tests/Giraffe.Htmx.Common.Tests.fsproj delete mode 100644 src/Common.Tests/Program.fs delete mode 100644 src/Common.Tests/Tests.fs delete mode 100644 src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj delete mode 100644 src/Htmx.Tests/Program.fs delete mode 100644 src/Htmx.Tests/Tests.fs delete mode 100644 src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj delete mode 100644 src/ViewEngine.Htmx.Tests/Program.fs delete mode 100644 src/ViewEngine.Htmx.Tests/Tests.fs diff --git a/src/Common.Tests/Giraffe.Htmx.Common.Tests.fsproj b/src/Common.Tests/Giraffe.Htmx.Common.Tests.fsproj deleted file mode 100644 index 58aa294..0000000 --- a/src/Common.Tests/Giraffe.Htmx.Common.Tests.fsproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - false - false - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - diff --git a/src/Common.Tests/Program.fs b/src/Common.Tests/Program.fs deleted file mode 100644 index fdc31cd..0000000 --- a/src/Common.Tests/Program.fs +++ /dev/null @@ -1 +0,0 @@ -module Program = let [] main _ = 0 diff --git a/src/Common.Tests/Tests.fs b/src/Common.Tests/Tests.fs deleted file mode 100644 index 4172698..0000000 --- a/src/Common.Tests/Tests.fs +++ /dev/null @@ -1,35 +0,0 @@ -module Tests - -open Giraffe.Htmx -open Xunit - -/// Tests for the HxSwap module -module Swap = - - [] - let ``InnerHtml is correct`` () = - Assert.Equal ("innerHTML", HxSwap.InnerHtml) - - [] - let ``OuterHtml is correct`` () = - Assert.Equal ("outerHTML", HxSwap.OuterHtml) - - [] - let ``BeforeBegin is correct`` () = - Assert.Equal ("beforebegin", HxSwap.BeforeBegin) - - [] - let ``BeforeEnd is correct`` () = - Assert.Equal ("beforeend", HxSwap.BeforeEnd) - - [] - let ``AfterBegin is correct`` () = - Assert.Equal ("afterbegin", HxSwap.AfterBegin) - - [] - let ``AfterEnd is correct`` () = - Assert.Equal ("afterend", HxSwap.AfterEnd) - - [] - let ``None is correct`` () = - Assert.Equal ("none", HxSwap.None) diff --git a/src/Giraffe.Htmx.sln b/src/Giraffe.Htmx.sln index f8d92a3..3e73efa 100644 --- a/src/Giraffe.Htmx.sln +++ b/src/Giraffe.Htmx.sln @@ -5,16 +5,10 @@ VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx", "Htmx\Giraffe.Htmx.fsproj", "{8AB3085C-5236-485A-8565-A09106E72E1E}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx.Tests", "Htmx.Tests\Giraffe.Htmx.Tests.fsproj", "{D7CDD578-7A6F-4EF6-846A-80A55037E049}" -EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.ViewEngine.Htmx", "ViewEngine.Htmx\Giraffe.ViewEngine.Htmx.fsproj", "{F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.ViewEngine.Htmx.Tests", "ViewEngine.Htmx.Tests\Giraffe.ViewEngine.Htmx.Tests.fsproj", "{F21C28CE-1F18-4CB0-B2F7-10DABE84FB78}" -EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx.Common", "Common\Giraffe.Htmx.Common.fsproj", "{75D66845-F93A-4463-AD29-A8B16E4D4BA9}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Giraffe.Htmx.Common.Tests", "Common.Tests\Giraffe.Htmx.Common.Tests.fsproj", "{E261A653-68D5-4D7B-99A4-F09282B50F8A}" -EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests", "Tests\Tests.fsproj", "{39823773-4311-4E79-9CA0-F9DDC40CAF6A}" EndProject Global @@ -30,26 +24,14 @@ Global {8AB3085C-5236-485A-8565-A09106E72E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU {8AB3085C-5236-485A-8565-A09106E72E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU {8AB3085C-5236-485A-8565-A09106E72E1E}.Release|Any CPU.Build.0 = Release|Any CPU - {D7CDD578-7A6F-4EF6-846A-80A55037E049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7CDD578-7A6F-4EF6-846A-80A55037E049}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7CDD578-7A6F-4EF6-846A-80A55037E049}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7CDD578-7A6F-4EF6-846A-80A55037E049}.Release|Any CPU.Build.0 = Release|Any CPU {F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {F718B3C1-EE01-4F04-ABCE-BF2AE700FDA9}.Release|Any CPU.Build.0 = Release|Any CPU - {F21C28CE-1F18-4CB0-B2F7-10DABE84FB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F21C28CE-1F18-4CB0-B2F7-10DABE84FB78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F21C28CE-1F18-4CB0-B2F7-10DABE84FB78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F21C28CE-1F18-4CB0-B2F7-10DABE84FB78}.Release|Any CPU.Build.0 = Release|Any CPU {75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {75D66845-F93A-4463-AD29-A8B16E4D4BA9}.Release|Any CPU.Build.0 = Release|Any CPU - {E261A653-68D5-4D7B-99A4-F09282B50F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E261A653-68D5-4D7B-99A4-F09282B50F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E261A653-68D5-4D7B-99A4-F09282B50F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E261A653-68D5-4D7B-99A4-F09282B50F8A}.Release|Any CPU.Build.0 = Release|Any CPU {39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU {39823773-4311-4E79-9CA0-F9DDC40CAF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj b/src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj deleted file mode 100644 index 056f57c..0000000 --- a/src/Htmx.Tests/Giraffe.Htmx.Tests.fsproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - false - false - - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - diff --git a/src/Htmx.Tests/Program.fs b/src/Htmx.Tests/Program.fs deleted file mode 100644 index fdc31cd..0000000 --- a/src/Htmx.Tests/Program.fs +++ /dev/null @@ -1 +0,0 @@ -module Program = let [] main _ = 0 diff --git a/src/Htmx.Tests/Tests.fs b/src/Htmx.Tests/Tests.fs deleted file mode 100644 index 213ac70..0000000 --- a/src/Htmx.Tests/Tests.fs +++ /dev/null @@ -1,372 +0,0 @@ -module Giraffe.Htmx.Tests - -open System -open Giraffe.Htmx -open Microsoft.AspNetCore.Http -open NSubstitute -open Xunit - -/// Tests for the IHeaderDictionary extension properties -module IHeaderDictionaryExtensions = - - [] - let ``HxBoosted succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxBoosted |> Assert.True - - [] - let ``HxBoosted succeeds when the header is present and true`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Boosted", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxBoosted |> Assert.True - Option.get ctx.Request.Headers.HxBoosted |> Assert.True - - [] - let ``HxBoosted succeeds when the header is present and false`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Boosted", "false") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxBoosted |> Assert.True - Option.get ctx.Request.Headers.HxBoosted |> Assert.False - - [] - let ``HxCurrentUrl succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxCurrentUrl |> Assert.True - - [] - let ``HxCurrentUrl succeeds when the header is present`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Current-URL", "http://localhost/test.htm") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxCurrentUrl |> Assert.True - Assert.Equal (Uri "http://localhost/test.htm", Option.get ctx.Request.Headers.HxCurrentUrl) - - [] - let ``HxHistoryRestoreRequest succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True - - [] - let ``HxHistoryRestoreRequest succeeds when the header is present and true`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-History-Restore-Request", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True - Option.get ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True - - [] - let ``HxHistoryRestoreRequest succeeds when the header is present and false`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-History-Restore-Request", "false") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.True - Option.get ctx.Request.Headers.HxHistoryRestoreRequest |> Assert.False - - [] - let ``HxPrompt succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxPrompt |> Assert.True - - [] - let ``HxPrompt succeeds when the header is present`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Prompt", "of course") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxPrompt |> Assert.True - Assert.Equal("of course", Option.get ctx.Request.Headers.HxPrompt) - - [] - let ``HxRequest succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxRequest |> Assert.True - - [] - let ``HxRequest succeeds when the header is present and true`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Request", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxRequest |> Assert.True - Option.get ctx.Request.Headers.HxRequest |> Assert.True - - [] - let ``HxRequest succeeds when the header is present and false`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Request", "false") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxRequest |> Assert.True - Option.get ctx.Request.Headers.HxRequest |> Assert.False - - [] - let ``HxTarget succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxTarget |> Assert.True - - [] - let ``HxTarget succeeds when the header is present`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Target", "#leItem") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxTarget |> Assert.True - Assert.Equal("#leItem", Option.get ctx.Request.Headers.HxTarget) - - [] - let ``HxTrigger succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxTrigger |> Assert.True - - [] - let ``HxTrigger succeeds when the header is present`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Trigger", "#trig") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxTrigger |> Assert.True - Assert.Equal("#trig", Option.get ctx.Request.Headers.HxTrigger) - - [] - let ``HxTriggerName succeeds when the header is not present`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Option.isNone ctx.Request.Headers.HxTriggerName |> Assert.True - - [] - let ``HxTriggerName succeeds when the header is present`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Trigger-Name", "click") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Option.isSome ctx.Request.Headers.HxTriggerName |> Assert.True - Assert.Equal("click", Option.get ctx.Request.Headers.HxTriggerName) - - -/// Tests for the HttpRequest extension properties -module HttpRequestExtensions = - - [] - let ``IsHtmx succeeds when request is not from htmx`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Assert.False ctx.Request.IsHtmx - - [] - let ``IsHtmx succeeds when request is from htmx`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Request", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Assert.True ctx.Request.IsHtmx - - [] - let ``IsHtmxRefresh succeeds when request is not from htmx`` () = - let ctx = Substitute.For () - ctx.Request.Headers.ReturnsForAnyArgs (HeaderDictionary ()) |> ignore - Assert.False ctx.Request.IsHtmxRefresh - - [] - let ``IsHtmxRefresh succeeds when request is from htmx, but not a refresh`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Request", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Assert.False ctx.Request.IsHtmxRefresh - - [] - let ``IsHtmxRefresh succeeds when request is from htmx and is a refresh`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - dic.Add ("HX-Request", "true") - dic.Add ("HX-History-Restore-Request", "true") - ctx.Request.Headers.ReturnsForAnyArgs dic |> ignore - Assert.True ctx.Request.IsHtmxRefresh - - -/// Tests for the HttpHandler functions provided in the Handlers module -module HandlerTests = - - open System.Threading.Tasks - - /// Dummy "next" parameter to get the pipeline to execute/terminate - let next (ctx : HttpContext) = Task.FromResult (Some ctx) - - [] - let ``withHxPushUrl succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxPushUrl "/a-new-url" next ctx - Assert.True (dic.ContainsKey "HX-Push-Url") - Assert.Equal ("/a-new-url", dic["HX-Push-Url"][0]) - } - - [] - let ``withHxNoPushUrl succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxNoPushUrl next ctx - Assert.True (dic.ContainsKey "HX-Push-Url") - Assert.Equal ("false", dic["HX-Push-Url"][0]) - } - - [] - let ``withHxRedirect succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxRedirect "/somewhere-else" next ctx - Assert.True (dic.ContainsKey "HX-Redirect") - Assert.Equal ("/somewhere-else", dic["HX-Redirect"][0]) - } - - [] - let ``withHxRefresh succeeds when set to true`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxRefresh true next ctx - Assert.True (dic.ContainsKey "HX-Refresh") - Assert.Equal ("true", dic["HX-Refresh"][0]) - } - - [] - let ``withHxRefresh succeeds when set to false`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxRefresh false next ctx - Assert.True (dic.ContainsKey "HX-Refresh") - Assert.Equal ("false", dic["HX-Refresh"][0]) - } - - [] - let ``withHxReplaceUrl succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxReplaceUrl "/a-substitute-url" next ctx - Assert.True (dic.ContainsKey "HX-Replace-Url") - Assert.Equal ("/a-substitute-url", dic["HX-Replace-Url"][0]) - } - - [] - let ``withHxNoReplaceUrl succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxNoReplaceUrl next ctx - Assert.True (dic.ContainsKey "HX-Replace-Url") - Assert.Equal ("false", dic["HX-Replace-Url"][0]) - } - - [] - let ``withHxReswap succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxReswap HxSwap.BeforeEnd next ctx - Assert.True (dic.ContainsKey "HX-Reswap") - Assert.Equal (HxSwap.BeforeEnd, dic["HX-Reswap"][0]) - } - - [] - let ``withHxRetarget succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxRetarget "#somewhereElse" next ctx - Assert.True (dic.ContainsKey "HX-Retarget") - Assert.Equal ("#somewhereElse", dic["HX-Retarget"][0]) - } - - [] - let ``withHxTrigger succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTrigger "doSomething" next ctx - Assert.True (dic.ContainsKey "HX-Trigger") - Assert.Equal ("doSomething", dic["HX-Trigger"][0]) - } - - [] - let ``withHxTriggerMany succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTriggerMany [ "blah", "foo"; "bleh", "bar" ] next ctx - Assert.True (dic.ContainsKey "HX-Trigger") - Assert.Equal ("""{ "blah": "foo", "bleh": "bar" }""", dic["HX-Trigger"][0]) - } - - [] - let ``withHxTriggerAfterSettle succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTriggerAfterSettle "byTheWay" next ctx - Assert.True (dic.ContainsKey "HX-Trigger-After-Settle") - Assert.Equal ("byTheWay", dic["HX-Trigger-After-Settle"][0]) - } - - [] - let ``withHxTriggerManyAfterSettle succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTriggerManyAfterSettle [ "oof", "ouch"; "hmm", "uh" ] next ctx - Assert.True (dic.ContainsKey "HX-Trigger-After-Settle") - Assert.Equal ("""{ "oof": "ouch", "hmm": "uh" }""", dic["HX-Trigger-After-Settle"][0]) - } - - [] - let ``withHxTriggerAfterSwap succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTriggerAfterSwap "justASec" next ctx - Assert.True (dic.ContainsKey "HX-Trigger-After-Swap") - Assert.Equal ("justASec", dic["HX-Trigger-After-Swap"][0]) - } - - [] - let ``withHxTriggerManyAfterSwap succeeds`` () = - let ctx = Substitute.For () - let dic = HeaderDictionary () - ctx.Response.Headers.ReturnsForAnyArgs dic |> ignore - task { - let! _ = withHxTriggerManyAfterSwap [ "this", "1"; "that", "2" ] next ctx - Assert.True (dic.ContainsKey "HX-Trigger-After-Swap") - Assert.Equal ("""{ "this": "1", "that": "2" }""", dic["HX-Trigger-After-Swap"][0]) - } diff --git a/src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj b/src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj deleted file mode 100644 index 9d9d736..0000000 --- a/src/ViewEngine.Htmx.Tests/Giraffe.ViewEngine.Htmx.Tests.fsproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - false - false - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - diff --git a/src/ViewEngine.Htmx.Tests/Program.fs b/src/ViewEngine.Htmx.Tests/Program.fs deleted file mode 100644 index fdc31cd..0000000 --- a/src/ViewEngine.Htmx.Tests/Program.fs +++ /dev/null @@ -1 +0,0 @@ -module Program = let [] main _ = 0 diff --git a/src/ViewEngine.Htmx.Tests/Tests.fs b/src/ViewEngine.Htmx.Tests/Tests.fs deleted file mode 100644 index c48cbf2..0000000 --- a/src/ViewEngine.Htmx.Tests/Tests.fs +++ /dev/null @@ -1,583 +0,0 @@ -module Giraffe.ViewEngine.Htmx.Tests - -open Giraffe.ViewEngine -open Xunit - -/// Tests for the HxEncoding module -module Encoding = - - [] - let ``Form is correct`` () = - Assert.Equal ("application/x-www-form-urlencoded", HxEncoding.Form) - - [] - let ``MultipartForm is correct`` () = - Assert.Equal ("multipart/form-data", HxEncoding.MultipartForm) - - -/// Tests for the HxHeaders module -module Headers = - - [] - let ``From succeeds with an empty list`` () = - Assert.Equal ("{ }", HxHeaders.From []) - - [] - let ``From succeeds and escapes quotes`` () = - Assert.Equal ("{ \"test\": \"one two three\", \"again\": \"four \\\"five\\\" six\" }", - HxHeaders.From [ "test", "one two three"; "again", "four \"five\" six" ]) - - -/// Tests for the HxParams module -module Params = - - [] - let ``All is correct`` () = - Assert.Equal ("*", HxParams.All) - - [] - let ``None is correct`` () = - Assert.Equal ("none", HxParams.None) - - [] - let ``With succeeds with empty list`` () = - Assert.Equal ("", HxParams.With []) - - [] - let ``With succeeds with one list item`` () = - Assert.Equal ("boo", HxParams.With [ "boo" ]) - - [] - let ``With succeeds with multiple list items`` () = - Assert.Equal ("foo,bar,baz", HxParams.With [ "foo"; "bar"; "baz" ]) - - [] - let ``Except succeeds with empty list`` () = - Assert.Equal ("not ", HxParams.Except []) - - [] - let ``Except succeeds with one list item`` () = - Assert.Equal ("not that", HxParams.Except [ "that" ]) - - [] - let ``Except succeeds with multiple list items`` () = - Assert.Equal ("not blue,green", HxParams.Except [ "blue"; "green" ]) - - -/// Tests for the HxRequest module -module Request = - - [] - let ``Configure succeeds with an empty list`` () = - Assert.Equal ("{ }", HxRequest.Configure []) - - [] - let ``Configure succeeds with a non-empty list`` () = - Assert.Equal ("{ \"a\": \"b\", \"c\": \"d\" }", HxRequest.Configure [ "\"a\": \"b\""; "\"c\": \"d\"" ]) - - [] - let ``Configure succeeds with all known params configured`` () = - Assert.Equal ("{ \"timeout\": 1000, \"credentials\": false, \"noHeaders\": true }", - HxRequest.Configure [ HxRequest.Timeout 1000; HxRequest.Credentials false; HxRequest.NoHeaders true ]) - - [] - let ``Timeout succeeds`` () = - Assert.Equal ("\"timeout\": 50", HxRequest.Timeout 50) - - [] - let ``Credentials succeeds when set to true`` () = - Assert.Equal ("\"credentials\": true", HxRequest.Credentials true) - - [] - let ``Credentials succeeds when set to false`` () = - Assert.Equal ("\"credentials\": false", HxRequest.Credentials false) - - [] - let ``NoHeaders succeeds when set to true`` () = - Assert.Equal ("\"noHeaders\": true", HxRequest.NoHeaders true) - - [] - let ``NoHeaders succeeds when set to false`` () = - Assert.Equal ("\"noHeaders\": false", HxRequest.NoHeaders false) - - -/// Tests for the HxTrigger module -module Trigger = - - [] - let ``Click is correct`` () = - Assert.Equal ("click", HxTrigger.Click) - - [] - let ``Load is correct`` () = - Assert.Equal ("load", HxTrigger.Load) - - [] - let ``Revealed is correct`` () = - Assert.Equal ("revealed", HxTrigger.Revealed) - - [] - let ``Every succeeds`` () = - Assert.Equal ("every 3s", HxTrigger.Every "3s") - - [] - let ``Filter.Alt succeeds`` () = - Assert.Equal ("click[altKey]", HxTrigger.Filter.Alt HxTrigger.Click) - - [] - let ``Filter.Ctrl succeeds`` () = - Assert.Equal ("click[ctrlKey]", HxTrigger.Filter.Ctrl HxTrigger.Click) - - [] - let ``Filter.Shift succeeds`` () = - Assert.Equal ("click[shiftKey]", HxTrigger.Filter.Shift HxTrigger.Click) - - [] - let ``Filter.CtrlAlt succeeds`` () = - Assert.Equal ("click[ctrlKey&&altKey]", HxTrigger.Filter.CtrlAlt HxTrigger.Click) - - [] - let ``Filter.CtrlShift succeeds`` () = - Assert.Equal ("click[ctrlKey&&shiftKey]", HxTrigger.Filter.CtrlShift HxTrigger.Click) - - [] - let ``Filter.CtrlAltShift succeeds`` () = - Assert.Equal ("click[ctrlKey&&altKey&&shiftKey]", HxTrigger.Filter.CtrlAltShift HxTrigger.Click) - - [] - let ``Filter.AltShift succeeds`` () = - Assert.Equal ("click[altKey&&shiftKey]", HxTrigger.Filter.AltShift HxTrigger.Click) - - [] - let ``Once succeeds when it is the first modifier`` () = - Assert.Equal ("once", HxTrigger.Once "") - - [] - let ``Once succeeds when it is not the first modifier`` () = - Assert.Equal ("click once", HxTrigger.Once "click") - - [] - let ``Changed succeeds when it is the first modifier`` () = - Assert.Equal ("changed", HxTrigger.Changed "") - - [] - let ``Changed succeeds when it is not the first modifier`` () = - Assert.Equal ("click changed", HxTrigger.Changed "click") - - [] - let ``Delay succeeds when it is the first modifier`` () = - Assert.Equal ("delay:1s", HxTrigger.Delay "1s" "") - - [] - let ``Delay succeeds when it is not the first modifier`` () = - Assert.Equal ("click delay:2s", HxTrigger.Delay "2s" "click") - - [] - let ``Throttle succeeds when it is the first modifier`` () = - Assert.Equal ("throttle:4s", HxTrigger.Throttle "4s" "") - - [] - let ``Throttle succeeds when it is not the first modifier`` () = - Assert.Equal ("click throttle:7s", HxTrigger.Throttle "7s" "click") - - [] - let ``From succeeds when it is the first modifier`` () = - Assert.Equal ("from:.nav", HxTrigger.From ".nav" "") - - [] - let ``From succeeds when it is not the first modifier`` () = - Assert.Equal ("click from:#somewhere", HxTrigger.From "#somewhere" "click") - - [] - let ``FromDocument succeeds when it is the first modifier`` () = - Assert.Equal ("from:document", HxTrigger.FromDocument "") - - [] - let ``FromDocument succeeds when it is not the first modifier`` () = - Assert.Equal ("click from:document", HxTrigger.FromDocument "click") - - [] - let ``FromWindow succeeds when it is the first modifier`` () = - Assert.Equal ("from:window", HxTrigger.FromWindow "") - - [] - let ``FromWindow succeeds when it is not the first modifier`` () = - Assert.Equal ("click from:window", HxTrigger.FromWindow "click") - - [] - let ``FromClosest succeeds when it is the first modifier`` () = - Assert.Equal ("from:closest div", HxTrigger.FromClosest "div" "") - - [] - let ``FromClosest succeeds when it is not the first modifier`` () = - Assert.Equal ("click from:closest p", HxTrigger.FromClosest "p" "click") - - [] - let ``FromFind succeeds when it is the first modifier`` () = - Assert.Equal ("from:find li", HxTrigger.FromFind "li" "") - - [] - let ``FromFind succeeds when it is not the first modifier`` () = - Assert.Equal ("click from:find .spot", HxTrigger.FromFind ".spot" "click") - - [] - let ``Target succeeds when it is the first modifier`` () = - Assert.Equal ("target:main", HxTrigger.Target "main" "") - - [] - let ``Target succeeds when it is not the first modifier`` () = - Assert.Equal ("click target:footer", HxTrigger.Target "footer" "click") - - [] - let ``Consume succeeds when it is the first modifier`` () = - Assert.Equal ("consume", HxTrigger.Consume "") - - [] - let ``Consume succeeds when it is not the first modifier`` () = - Assert.Equal ("click consume", HxTrigger.Consume "click") - - [] - let ``Queue succeeds when it is the first modifier`` () = - Assert.Equal ("queue:abc", HxTrigger.Queue "abc" "") - - [] - let ``Queue succeeds when it is not the first modifier`` () = - Assert.Equal ("click queue:def", HxTrigger.Queue "def" "click") - - [] - let ``QueueFirst succeeds when it is the first modifier`` () = - Assert.Equal ("queue:first", HxTrigger.QueueFirst "") - - [] - let ``QueueFirst succeeds when it is not the first modifier`` () = - Assert.Equal ("click queue:first", HxTrigger.QueueFirst "click") - - [] - let ``QueueLast succeeds when it is the first modifier`` () = - Assert.Equal ("queue:last", HxTrigger.QueueLast "") - - [] - let ``QueueLast succeeds when it is not the first modifier`` () = - Assert.Equal ("click queue:last", HxTrigger.QueueLast "click") - - [] - let ``QueueAll succeeds when it is the first modifier`` () = - Assert.Equal ("queue:all", HxTrigger.QueueAll "") - - [] - let ``QueueAll succeeds when it is not the first modifier`` () = - Assert.Equal ("click queue:all", HxTrigger.QueueAll "click") - - [] - let ``QueueNone succeeds when it is the first modifier`` () = - Assert.Equal ("queue:none", HxTrigger.QueueNone "") - - [] - let ``QueueNone succeeds when it is not the first modifier`` () = - Assert.Equal ("click queue:none", HxTrigger.QueueNone "click") - - -/// Tests for the HxVals module -module Vals = - - [] - let ``From succeeds with an empty list`` () = - Assert.Equal ("{ }", HxVals.From []) - - [] - let ``From succeeds and escapes quotes`` () = - Assert.Equal ("{ \"test\": \"a \\\"b\\\" c\", \"2\": \"d e f\" }", - HxVals.From [ "test", "a \"b\" c"; "2", "d e f" ]) - - -/// Tests for the HtmxAttrs module -module Attributes = - - /// Pipe-able assertion for a rendered node - let shouldRender expected node = Assert.Equal (expected, RenderView.AsString.htmlNode node) - - [] - let ``_hxBoost succeeds`` () = - div [ _hxBoost ] [] |> shouldRender """
""" - - [] - let ``_hxConfirm succeeds`` () = - button [ _hxConfirm "REALLY?!?" ] [] |> shouldRender """""" - - [] - let ``_hxDelete succeeds`` () = - span [ _hxDelete "/this-endpoint" ] [] |> shouldRender """""" - - [] - let ``_hxDisable succeeds`` () = - p [ _hxDisable ] [] |> shouldRender """

""" - - [] - let ``_hxDisinherit succeeds`` () = - strong [ _hxDisinherit "*" ] [] |> shouldRender """""" - - [] - let ``_hxEncoding succeeds`` () = - form [ _hxEncoding "utf-7" ] [] |> shouldRender """
""" - - [] - let ``_hxExt succeeds`` () = - section [ _hxExt "extendme" ] [] |> shouldRender """
""" - - [] - let ``_hxGet succeeds`` () = - article [ _hxGet "/the-text" ] [] |> shouldRender """
""" - - [] - let ``_hxHeaders succeeds`` () = - figure [ _hxHeaders """{ "X-Special-Header": "some-header" }""" ] [] - |> shouldRender """
""" - - [] - let ``_hxHistory succeeds`` () = - span [ _hxHistory "false" ] [] |> shouldRender """""" - - [] - let ``_hxHistoryElt succeeds`` () = - table [ _hxHistoryElt ] [] |> shouldRender """
""" - - [] - let ``_hxInclude succeeds`` () = - a [ _hxInclude ".extra-stuff" ] [] |> shouldRender """""" - - [] - let ``_hxIndicator succeeds`` () = - aside [ _hxIndicator "#spinner" ] [] |> shouldRender """""" - - [] - let ``_hxNoBoost succeeds`` () = - td [ _hxNoBoost ] [] |> shouldRender """""" - - [] - let ``_hxParams succeeds`` () = - br [ _hxParams "[p1,p2]" ] |> shouldRender """
""" - - [] - let ``_hxPatch succeeds`` () = - div [ _hxPatch "/arrrgh" ] [] |> shouldRender """
""" - - [] - let ``_hxPost succeeds`` () = - hr [ _hxPost "/hear-ye-hear-ye" ] |> shouldRender """
""" - - [] - let ``_hxPreserve succeeds`` () = - img [ _hxPreserve ] |> shouldRender """""" - - [] - let ``_hxPrompt succeeds`` () = - strong [ _hxPrompt "Who goes there?" ] [] |> shouldRender """""" - - [] - let ``_hxPushUrl succeeds`` () = - dl [ _hxPushUrl "/a-b-c" ] [] |> shouldRender """
""" - - [] - let ``_hxPut succeeds`` () = - s [ _hxPut "/take-this" ] [] |> shouldRender """""" - - [] - let ``_hxReplaceUrl succeeds`` () = - p [ _hxReplaceUrl "/something-else" ] [] |> shouldRender """

""" - - [] - let ``_hxRequest succeeds`` () = - u [ _hxRequest "noHeaders" ] [] |> shouldRender """""" - - [] - let ``_hxSelect succeeds`` () = - nav [ _hxSelect "#navbar" ] [] |> shouldRender """""" - - [] - let ``_hxSelectOob succeeds`` () = - section [ _hxSelectOob "#oob" ] [] |> shouldRender """
""" - - [] - let ``_hxSse succeeds`` () = - footer [ _hxSse "connect:/my-events" ] [] |> shouldRender """
""" - - [] - let ``_hxSwap succeeds`` () = - del [ _hxSwap "innerHTML" ] [] |> shouldRender """""" - - [] - let ``_hxSwapOob succeeds`` () = - li [ _hxSwapOob "true" ] [] |> shouldRender """
  • """ - - [] - let ``_hxSync succeeds`` () = - nav [ _hxSync "closest form:abort" ] [] |> shouldRender """""" - - [] - let ``_hxTarget succeeds`` () = - header [ _hxTarget "#somewhereElse" ] [] |> shouldRender """
    """ - - [] - let ``_hxTrigger succeeds`` () = - figcaption [ _hxTrigger "load" ] [] |> shouldRender """
    """ - - [] - let ``_hxVals succeeds`` () = - dt [ _hxVals """{ "extra": "values" }""" ] [] - |> shouldRender """
    """ - - [] - let ``_hxWs succeeds`` () = - ul [ _hxWs "connect:/web-socket" ] [] |> shouldRender """
      """ - - -/// Tests for the Script module -module Script = - - [] - let ``Script.minified succeeds`` () = - let html = RenderView.AsString.htmlNode Script.minified - Assert.Equal - ("""""", - html) - - [] - let ``Script.unminified succeeds`` () = - let html = RenderView.AsString.htmlNode Script.unminified - Assert.Equal - ("""""", - html) - - -/// Tests for the RenderFragment module -module RenderFragment = - - open System.Text - - [] - let ``RenderFragment.findIdNode fails with a Text node`` () = - Assert.False (Option.isSome (RenderFragment.findIdNode "blue" (Text ""))) - - [] - let ``RenderFragment.findIdNode fails with a VoidElement without a matching ID`` () = - Assert.False (Option.isSome (RenderFragment.findIdNode "purple" (br [ _id "mauve" ]))) - - [] - let ``RenderFragment.findIdNode fails with a ParentNode with no children with a matching ID`` () = - Assert.False (Option.isSome (RenderFragment.findIdNode "green" (p [] [ str "howdy"; span [] [ str "huh" ] ]))) - - [] - let ``RenderFragment.findIdNode succeeds with a VoidElement with a matching ID`` () = - let leNode = hr [ _id "groovy" ] - let foundNode = RenderFragment.findIdNode "groovy" leNode - Assert.True (Option.isSome foundNode) - Assert.Same (leNode, foundNode.Value) - - [] - let ``RenderFragment.findIdNode succeeds with a ParentNode with a child with a matching ID`` () = - let leNode = span [ _id "its-me" ] [ str "Mario" ] - let foundNode = RenderFragment.findIdNode "its-me" (p [] [ str "test"; str "again"; leNode; str "un mas" ]) - Assert.True (Option.isSome foundNode) - Assert.Same (leNode, foundNode.Value) - - /// Generate a message if the requested ID node is not found - let private nodeNotFound (nodeId : string) = - $"– ID {nodeId} not found –" - - /// Tests for the AsString module - module AsString = - - [] - let ``RenderFragment.AsString.htmlFromNodes succeeds when an ID is matched`` () = - let html = - RenderFragment.AsString.htmlFromNodes "needle" - [ p [] []; p [ _id "haystack" ] [ span [ _id "needle" ] [ str "ouch" ]; str "hay"; str "hay" ]] - Assert.Equal ("""ouch""", html) - - [] - let ``RenderFragment.AsString.htmlFromNodes fails when an ID is not matched`` () = - Assert.Equal (nodeNotFound "oops", RenderFragment.AsString.htmlFromNodes "oops" []) - - [] - let ``RenderFragment.AsString.htmlFromNode succeeds when ID is matched at top level`` () = - let html = RenderFragment.AsString.htmlFromNode "wow" (p [ _id "wow" ] [ str "found it" ]) - Assert.Equal ("""

      found it

      """, html) - - [] - let ``RenderFragment.AsString.htmlFromNode succeeds when ID is matched in child element`` () = - let html = - div [] [ p [] [ str "not it" ]; p [ _id "hey" ] [ str "ta-da" ]] - |> RenderFragment.AsString.htmlFromNode "hey" - Assert.Equal ("""

      ta-da

      """, html) - - [] - let ``RenderFragment.AsString.htmlFromNode fails when an ID is not matched`` () = - Assert.Equal (nodeNotFound "me", RenderFragment.AsString.htmlFromNode "me" (hr [])) - - /// Tests for the AsBytes module - module AsBytes = - - /// Alias for UTF-8 encoding - let private utf8 = Encoding.UTF8 - - [] - let ``RenderFragment.AsBytes.htmlFromNodes succeeds when an ID is matched`` () = - let bytes = - RenderFragment.AsBytes.htmlFromNodes "found" - [ p [] []; p [ _id "not-it" ] [ str "nope"; span [ _id "found" ] [ str "boo" ]; str "nope" ]] - Assert.Equal (utf8.GetBytes """boo""", bytes) - - [] - let ``RenderFragment.AsBytes.htmlFromNodes fails when an ID is not matched`` () = - Assert.Equal (utf8.GetBytes (nodeNotFound "whiff"), RenderFragment.AsBytes.htmlFromNodes "whiff" []) - - [] - let ``RenderFragment.AsBytes.htmlFromNode succeeds when ID is matched at top level`` () = - let bytes = RenderFragment.AsBytes.htmlFromNode "first" (p [ _id "first" ] [ str "!!!" ]) - Assert.Equal (utf8.GetBytes """

      !!!

      """, bytes) - - [] - let ``RenderFragment.AsBytes.htmlFromNode succeeds when ID is matched in child element`` () = - let bytes = - div [] [ p [] [ str "not me" ]; p [ _id "child" ] [ str "node" ]] - |> RenderFragment.AsBytes.htmlFromNode "child" - Assert.Equal (utf8.GetBytes """

      node

      """, bytes) - - [] - let ``RenderFragment.AsBytes.htmlFromNode fails when an ID is not matched`` () = - Assert.Equal (utf8.GetBytes (nodeNotFound "foo"), RenderFragment.AsBytes.htmlFromNode "foo" (hr [])) - - /// Tests for the IntoStringBuilder module - module IntoStringBuilder = - - [] - let ``RenderFragment.IntoStringBuilder.htmlFromNodes succeeds when an ID is matched`` () = - let sb = StringBuilder () - RenderFragment.IntoStringBuilder.htmlFromNodes sb "find-me" - [ p [] []; p [ _id "peekaboo" ] [ str "bzz"; str "nope"; span [ _id "find-me" ] [ str ";)" ] ]] - Assert.Equal (""";)""", string sb) - - [] - let ``RenderFragment.IntoStringBuilder.htmlFromNodes fails when an ID is not matched`` () = - let sb = StringBuilder () - RenderFragment.IntoStringBuilder.htmlFromNodes sb "missing" [] - Assert.Equal (nodeNotFound "missing", string sb) - - [] - let ``RenderFragment.IntoStringBuilder.htmlFromNode succeeds when ID is matched at top level`` () = - let sb = StringBuilder () - RenderFragment.IntoStringBuilder.htmlFromNode sb "top" (p [ _id "top" ] [ str "pinnacle" ]) - Assert.Equal ("""

      pinnacle

      """, string sb) - - [] - let ``RenderFragment.IntoStringBuilder.htmlFromNode succeeds when ID is matched in child element`` () = - let sb = StringBuilder () - div [] [ p [] [ str "nada" ]; p [ _id "it" ] [ str "is here" ]] - |> RenderFragment.IntoStringBuilder.htmlFromNode sb "it" - Assert.Equal ("""

      is here

      """, string sb) - - [] - let ``RenderFragment.IntoStringBuilder.htmlFromNode fails when an ID is not matched`` () = - let sb = StringBuilder () - RenderFragment.IntoStringBuilder.htmlFromNode sb "bar" (hr []) - Assert.Equal (nodeNotFound "bar", string sb)