Solve conflicts on elm-test upgrade

elm-package.json

@@ -10,8 +10,8 @@
     "native-modules": true,
     "dependencies": {
         "avh4/elm-fifo": "1.0.3 <= v < 2.0.0",
-        "eeue56/elm-html-test": "3.0.0 <= v < 4.0.0",
-        "elm-community/elm-test": "3.1.0 <= v < 4.0.0",
+        "eeue56/elm-html-test": "3.1.1 <= v < 4.0.0",
+        "elm-community/elm-test": "4.1.0 <= v < 5.0.0",
         "elm-lang/core": "5.0.0 <= v < 6.0.0",
         "elm-lang/html": "2.0.0 <= v < 3.0.0",
         "elm-lang/http": "1.0.0 <= v < 2.0.0",

examples/RandomGif.elm

@@ -3,7 +3,7 @@ module RandomGif exposing (..)
 -- From section 5 of the Elm Architecture Tutorial https://github.com/evancz/elm-architecture-tutorial#example-5-random-gif-viewer
 
 import Html exposing (..)
-import Html.Attributes exposing (style, src)
+import Html.Attributes exposing (src, style)
 import Html.Events exposing (onClick)
 import Http
 import Json.Decode as Json

examples/WebsocketChat.elm

@@ -1,4 +1,4 @@
-module WebsocketChat exposing (program, Msg(..))
+module WebsocketChat exposing (Msg(..), program)
 
 import Html exposing (Html)
 import WebSocket

examples/tests/RandomGifTests.elm

@@ -1,12 +1,12 @@
 module RandomGifTests exposing (..)
 
-import TestContext exposing (..)
 import Expect exposing (Expectation)
 import RandomGif
 import Test exposing (..)
-import Test.Http
 import Test.Html.Query as Query
 import Test.Html.Selector exposing (..)
+import Test.Http
+import TestContext exposing (..)
 
 
 program : TestContext RandomGif.Model RandomGif.Msg

examples/tests/Tests.elm

@@ -1,7 +1,7 @@
 module Tests exposing (..)
 
-import Test exposing (..)
 import RandomGifTests
+import Test exposing (..)
 import WebsocketChatTests
 
 

examples/tests/WebsocketChatTests.elm

@@ -1,8 +1,8 @@
 module WebsocketChatTests exposing (all)
 
 import Test exposing (..)
-import TestContext exposing (..)
 import Test.WebSocket
+import TestContext exposing (..)
 import WebsocketChat exposing (Msg(..))
 
 

examples/tests/elm-package.json

@@ -12,13 +12,12 @@
     "native-modules": true,
     "dependencies": {
         "avh4/elm-fifo": "1.0.3 <= v < 2.0.0",
-        "eeue56/elm-html-test": "3.0.0 <= v < 4.0.0",
-        "elm-community/elm-test": "3.1.0 <= v < 4.0.0",
+        "eeue56/elm-html-test": "3.1.1 <= v < 4.0.0",
+        "elm-community/elm-test": "4.1.0 <= v < 5.0.0",
         "elm-lang/core": "5.1.1 <= v < 6.0.0",
         "elm-lang/html": "2.0.0 <= v < 3.0.0",
         "elm-lang/http": "1.0.0 <= v < 2.0.0",
-        "elm-lang/websocket": "1.0.2 <= v < 2.0.0",
-        "rtfeldman/node-test-runner": "3.0.0 <= v < 4.0.0"
+        "elm-lang/websocket": "1.0.2 <= v < 2.0.0"
     },
     "elm-version": "0.18.0 <= v < 0.19.0"
 }

package.json

@@ -38,10 +38,9 @@
   },
   "devDependencies": {
     "elm": "^0.18.0",
-    "elm-test": "^0.18.2",
-    "standard": "*"
+    "elm-test": "^0.18.3"
   },
   "scripts": {
-    "test": "elm-make --yes && elm-test && (cd examples && elm-make --yes RandomGif.elm && elm-test) && standard --verbose"
+    "test": "elm-make --yes && elm-test 'tests/**/*Tests.elm' && (cd examples && elm-make --yes RandomGif.elm && elm-test)"
   }
 }

src/DefaultDict.elm

@@ -1,4 +1,4 @@
-module DefaultDict exposing (DefaultDict, empty, insert, update, get, toList, toDict)
+module DefaultDict exposing (DefaultDict, empty, get, insert, toDict, toList, update)
 
 import Dict exposing (Dict)
 

src/PairingHeap.elm

@@ -1,12 +1,12 @@
 module PairingHeap
     exposing
         ( PairingHeap
+        , deleteMin
         , empty
         , findMin
-        , merge
-        , insert
-        , deleteMin
         , fromList
+        , insert
+        , merge
         , toSortedList
         )
 
@@ -139,4 +139,4 @@ toSortedList heap =
             []
 
         Heap k v _ ->
-            ( k, v ) :: (toSortedList (deleteMin heap))
+            ( k, v ) :: toSortedList (deleteMin heap)

src/Test/Http.elm

@@ -1,18 +1,18 @@
 module Test.Http
     exposing
         ( badStatus
-        , expectRequest
         , expectGet
-        , resolveRequest
-        , resolveGet
+        , expectRequest
         , rejectGet
+        , resolveGet
+        , resolveRequest
         )
 
 import Dict exposing (Dict)
 import Expect exposing (Expectation)
 import Http
-import Testable.Task exposing (fromPlatformTask, Task(..), ProcessId(..))
 import TestContextInternal as Internal exposing (TestContext(..))
+import Testable.Task exposing (ProcessId(..), Task(..), fromPlatformTask)
 
 
 type alias RequestMatcher =
@@ -56,7 +56,7 @@ expectRequest { method, url } =
                         |> List.sortBy (\( a, b ) -> ( b, a ))
                         |> List.map (\( a, b ) -> "    - " ++ a ++ " " ++ b)
                         |> String.join "\n"
-                        |> ((++) "pending HTTP requests:\n")
+                        |> (++) "pending HTTP requests:\n"
                 , "╷"
                 , "│ to include (Test.Http.expectRequest)"
                 , "╵"

src/Test/WebSocket.elm

@@ -3,8 +3,8 @@ module Test.WebSocket exposing (acceptConnection, acceptMessage)
 import DefaultDict
 import Dict
 import Fifo
-import Testable.Task exposing (ProcessId(..))
 import TestContextInternal as Internal exposing (TestContext(..))
+import Testable.Task exposing (ProcessId(..))
 
 
 acceptConnection : String -> TestContext msg model -> TestContext msg model

src/TestContext.elm

@@ -1,22 +1,22 @@
 module TestContext
     exposing
         ( TestContext
-        , start
-        , startWithFlags
-        , update
-        , simulate
-        , send
-        , expectCmd
         , advanceTime
+        , done
+        , expectCmd
         , expectModel
         , expectView
-        , done
+        , send
+        , simulate
+        , start
+        , startWithFlags
+        , update
         )
 
 import Expect exposing (Expectation)
-import TestContextInternal as Internal
-import Test.Html.Query
 import Test.Html.Events exposing (Event)
+import Test.Html.Query
+import TestContextInternal as Internal
 import Time exposing (Time)