From cf8a0ab5621a5e5d678c347d709923cc1599438e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20=C5=81asocha?= Date: Fri, 1 Mar 2024 09:21:57 +0100 Subject: [PATCH] Fix tests --- .../elm/tests/DecodersTest.elm | 13 ++++++---- .../elm/tests/RouteTest.elm | 25 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ruby_event_store-browser/elm/tests/DecodersTest.elm b/ruby_event_store-browser/elm/tests/DecodersTest.elm index 34e3454060..65bfeeb015 100644 --- a/ruby_event_store-browser/elm/tests/DecodersTest.elm +++ b/ruby_event_store-browser/elm/tests/DecodersTest.elm @@ -4,6 +4,7 @@ import Api exposing (eventDecoder, eventsDecoder) import Expect import Json.Decode import Main exposing (..) +import Pagination import Test exposing (..) import Time @@ -19,8 +20,8 @@ suite = """ { "links": { - "last": "/streams/all/head/forward/20", - "next": "/streams/all/004ada1e-2f01-4ed0-9c16-63dbc82269d2/backward/20" + "last": "http://localhost:9393/api/streams/all/relationships/events?page%5Bposition%5D=head&page%5Bdirection%5D=forward&page%5Bcount%5D=20", + "next": "http://localhost:9393/api/streams/all/relationships/events?page%5Bposition%5D=664ada1e-2f01-4ed0-9c16-63dbc82269d2&page%5Bdirection%5D=backward&page%5Bcount%5D=20" }, "data": [ { @@ -45,7 +46,7 @@ suite = """ output = - Json.Decode.decodeString eventsDecoder input + Json.Decode.decodeString (eventsDecoder Pagination.empty) input in Expect.equal output (Ok @@ -62,11 +63,13 @@ suite = , streams = Nothing } ] + , pagination = + Pagination.empty , links = - { next = Just "/streams/all/004ada1e-2f01-4ed0-9c16-63dbc82269d2/backward/20" + { next = Just { specification = (Pagination.Specification (Just "664ada1e-2f01-4ed0-9c16-63dbc82269d2") (Just "backward") (Just "20")) } , prev = Nothing , first = Nothing - , last = Just "/streams/all/head/forward/20" + , last = Just { specification = (Pagination.Specification (Just "head") (Just "forward") (Just "20")) } } } ) diff --git a/ruby_event_store-browser/elm/tests/RouteTest.elm b/ruby_event_store-browser/elm/tests/RouteTest.elm index 4d09d0e316..6b6559db5c 100644 --- a/ruby_event_store-browser/elm/tests/RouteTest.elm +++ b/ruby_event_store-browser/elm/tests/RouteTest.elm @@ -1,6 +1,7 @@ module RouteTest exposing (suite) import Expect +import Pagination import Route exposing (Route(..), buildUrl, decodeLocation, eventUrl, streamUrl) import Test exposing (..) import Url @@ -37,7 +38,7 @@ suite = withUrl "https://example.org" (\baseUrl -> Expect.equal - (buildUrl baseUrl [ "something" ]) + (buildUrl baseUrl [ "something" ] []) "/something" ) , test "buildUrl generates proper url when subdirectory absent, but with slash" <| @@ -45,7 +46,7 @@ suite = withUrl "https://example.org/" (\baseUrl -> Expect.equal - (buildUrl baseUrl [ "something" ]) + (buildUrl baseUrl [ "something" ] []) "/something" ) , test "buildUrl generates proper url with subdirectory" <| @@ -53,7 +54,7 @@ suite = withUrl "https://example.org/res" (\baseUrl -> Expect.equal - (buildUrl baseUrl [ "something" ]) + (buildUrl baseUrl [ "something" ] []) "/res/something" ) , test "buildUrl generates proper url with subdirectory and slash" <| @@ -61,7 +62,7 @@ suite = withUrl "https://example.org/res/" (\baseUrl -> Expect.equal - (buildUrl baseUrl [ "something" ]) + (buildUrl baseUrl [ "something" ] []) "/res/something" ) , test "buildUrl generates proper url with double subdirectory" <| @@ -69,7 +70,7 @@ suite = withUrl "https://example.org/res/foo" (\baseUrl -> Expect.equal - (buildUrl baseUrl [ "something" ]) + (buildUrl baseUrl [ "something" ] []) "/res/foo/something" ) , test "decodeLocation correctly stream url" <| @@ -80,7 +81,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "foo")) + (Just (BrowseEvents "foo" Pagination.empty)) ) ) , test "decodeLocation correctly stream url with slash" <| @@ -91,7 +92,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "foo")) + (Just (BrowseEvents "foo" Pagination.empty)) ) ) , test "decodeLocation correctly stream url with subdirectory" <| @@ -102,7 +103,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "foo")) + (Just (BrowseEvents "foo" Pagination.empty)) ) ) , test "decodeLocation correctly stream url with subdirectory and slash" <| @@ -113,7 +114,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "foo")) + (Just (BrowseEvents "foo" Pagination.empty)) ) ) , test "decodeLocation correctly stream url with double subdirectory" <| @@ -124,7 +125,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "foo")) + (Just (BrowseEvents "foo" Pagination.empty)) ) ) , test "decodeLocation correctly top url" <| @@ -135,7 +136,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "all")) + (Just (BrowseEvents "all" Pagination.empty)) ) ) , test "decodeLocation correctly top url with slash" <| @@ -146,7 +147,7 @@ suite = (\parsedUrl -> Expect.equal (decodeLocation baseUrl parsedUrl) - (Just (BrowseEvents "all")) + (Just (BrowseEvents "all" Pagination.empty)) ) ) , test "decodeLocation correctly event url" <|