From 3566d3ee7ac8dd771b06875bfa4779fa36b54d13 Mon Sep 17 00:00:00 2001
From: Bram <bram@noordstar.me>
Date: Fri, 19 Jul 2024 09:02:01 +0200
Subject: [PATCH] Solve elm test bugs from moving user

---
 tests/Test/Values/Context.elm  | 12 ++++++++----
 tests/Test/Values/Envelope.elm |  6 +++---
 tests/Test/Values/Vault.elm    |  4 +---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/Test/Values/Context.elm b/tests/Test/Values/Context.elm
index 888287d..b9d09cf 100644
--- a/tests/Test/Values/Context.elm
+++ b/tests/Test/Values/Context.elm
@@ -8,6 +8,7 @@ import Internal.Values.Context as Context exposing (Context, Versions)
 import Set
 import Test exposing (..)
 import Test.Tools.Timestamp as TestTimestamp
+import Test.Values.User as TestUser
 
 
 fuzzer : Fuzzer Context
@@ -17,22 +18,25 @@ fuzzer =
         maybeString =
             Fuzz.maybe Fuzz.string
     in
-    Fuzz.map8 (\a b c d ( e, f ) ( g, h ) ( i, j ) ( k, l ) -> Context a b c d e f g h i j k l)
+    Fuzz.map8 (\a b c ( d, e ) ( f, g ) ( h, i ) ( j, k ) ( l, m ) -> Context a b c d e f g h i j k l m)
         (Fuzz.constant <| Hashdict.empty .value)
         maybeString
         maybeString
-        maybeString
         (Fuzz.pair
+            maybeString
             (Fuzz.maybe TestTimestamp.fuzzer)
-            maybeString
         )
         (Fuzz.pair
             maybeString
+            maybeString
+        )
+        (Fuzz.pair
             Fuzz.string
+            maybeString
         )
         (Fuzz.pair
             maybeString
-            maybeString
+            (Fuzz.maybe TestUser.fuzzer)
         )
         (Fuzz.pair
             maybeString
diff --git a/tests/Test/Values/Envelope.elm b/tests/Test/Values/Envelope.elm
index 81bb569..2f1b2fb 100644
--- a/tests/Test/Values/Envelope.elm
+++ b/tests/Test/Values/Envelope.elm
@@ -25,7 +25,7 @@ suite =
                 [ fuzz Fuzz.string
                     "currentVersion"
                     (\s ->
-                        { content = s, serverName = "" }
+                        { content = s, serverName = "", user = Nothing }
                             |> Envelope.init
                             |> Envelope.extractSettings .currentVersion
                             |> Expect.equal Default.currentVersion
@@ -33,7 +33,7 @@ suite =
                 , fuzz Fuzz.string
                     "deviceName"
                     (\s ->
-                        { content = s, serverName = "" }
+                        { content = s, serverName = "", user = Nothing }
                             |> Envelope.init
                             |> Envelope.extractSettings .deviceName
                             |> Expect.equal Default.deviceName
@@ -41,7 +41,7 @@ suite =
                 , fuzz Fuzz.string
                     "syncTime"
                     (\s ->
-                        { content = s, serverName = "" }
+                        { content = s, serverName = "", user = Nothing }
                             |> Envelope.init
                             |> Envelope.extractSettings .syncTime
                             |> Expect.equal Default.syncTime
diff --git a/tests/Test/Values/Vault.elm b/tests/Test/Values/Vault.elm
index f1c90a0..5cf1aae 100644
--- a/tests/Test/Values/Vault.elm
+++ b/tests/Test/Values/Vault.elm
@@ -7,12 +7,11 @@ import Internal.Values.Vault exposing (Vault)
 import Test exposing (..)
 import Test.Tools.Hashdict as TestHashdict
 import Test.Values.Room as TestRoom
-import Test.Values.User as TestUser
 
 
 vault : Fuzzer Vault
 vault =
-    Fuzz.map4 Vault
+    Fuzz.map3 Vault
         (Fuzz.string
             |> Fuzz.map (\k -> ( k, Json.encode Json.int 0 ))
             |> Fuzz.list
@@ -20,4 +19,3 @@ vault =
         )
         (Fuzz.maybe Fuzz.string)
         (TestHashdict.fuzzer .roomId TestRoom.fuzzer)
-        (Fuzz.maybe TestUser.fuzzer)