Revert "Simplify expectations to a single expectation"

This reverts commit ad74829.

Author: Janiczek

src/Test.elm

@@ -161,7 +161,7 @@ test untrimmedDesc thunk =
         Internal.blankDescriptionFailure
 
     else
-        Internal.ElmTestVariant__Labeled desc (Internal.ElmTestVariant__UnitTest (\() -> thunk ()))
+        Internal.ElmTestVariant__Labeled desc (Internal.ElmTestVariant__UnitTest (\() -> [ thunk () ]))
 
 
 {-| Returns a [`Test`](#Test) that is "TODO" (not yet implemented). These tests

src/Test/Fuzz.elm

@@ -61,15 +61,16 @@ validatedFuzzTest desc fuzzer getExpectation distribution =
             in
             case runResult.failure of
                 Nothing ->
-                    Pass { distributionReport = runResult.distributionReport }
+                    [ Pass { distributionReport = runResult.distributionReport } ]
 
                 Just failure ->
-                    { failure
+                    [ { failure
                         | expectation =
                             failure.expectation
                                 |> Test.Expectation.withDistributionReport runResult.distributionReport
-                    }
+                      }
                         |> formatExpectation
+                    ]
         )
 
 

src/Test/Internal.elm

@@ -14,8 +14,8 @@ For more information, see <https://github.com/elm-explorations/test/pull/153>
 
 -}
 type Test
-    = ElmTestVariant__UnitTest (() -> Expectation)
-    | ElmTestVariant__FuzzTest (Random.Seed -> Int -> Expectation)
+    = ElmTestVariant__UnitTest (() -> List Expectation)
+    | ElmTestVariant__FuzzTest (Random.Seed -> Int -> List Expectation)
     | ElmTestVariant__Labeled String Test
     | ElmTestVariant__Skipped Test
     | ElmTestVariant__Only Test
@@ -27,7 +27,7 @@ type Test
 failNow : { description : String, reason : Reason } -> Test
 failNow record =
     ElmTestVariant__UnitTest
-        (\() -> Test.Expectation.fail record)
+        (\() -> [ Test.Expectation.fail record ])
 
 
 blankDescriptionFailure : Test

src/Test/Runner.elm

@@ -62,14 +62,14 @@ import Test.Runner.Failure exposing (Reason(..))
 {-| An unevaluated test.
 -}
 type Runnable
-    = Thunk (() -> Expectation)
+    = Thunk (() -> List Expectation)
 
 
 {-| A function which, when evaluated, produces a list of expectations. Also a
 list of labels which apply to this outcome.
 -}
 type alias Runner =
-    { run : () -> Expectation
+    { run : () -> List Expectation
     , labels : List String
     }
 
@@ -136,14 +136,14 @@ countRunnables runnable =
             countRunnables runner
 
 
-run : Runnable -> Expectation
+run : Runnable -> List Expectation
 run (Thunk fn) =
     case runThunk fn of
         Ok test ->
             test
 
         Err message ->
-            Expect.fail ("This test failed because it threw an exception: \"" ++ message ++ "\"")
+            [ Expect.fail ("This test failed because it threw an exception: \"" ++ message ++ "\"") ]
 
 
 runThunk : (() -> a) -> Result String a

tests/src/Helpers.elm

@@ -82,7 +82,9 @@ testSimplifyingWith { runs } test =
             Test.test label <|
                 \() ->
                     runner.run ()
-                        |> passToFail handleFailure
+                        |> List.head
+                        |> Maybe.map (passToFail handleFailure)
+                        |> Maybe.withDefault (Expect.fail "Somehow `testSimplifyingWith` had multiple tests inside")
 
         _ ->
             Debug.todo "Unexpected number of test runners in `testSimplifyingWith`"
@@ -123,7 +125,9 @@ testFailingWith { runs } test =
             Test.test label <|
                 \() ->
                     runner.run ()
-                        |> passToFail handleFailure
+                        |> List.head
+                        |> Maybe.map (passToFail handleFailure)
+                        |> Maybe.withDefault (Expect.fail "Somehow `testFailingWith` had multiple tests inside")
 
         _ ->
             Debug.todo "Unexpected number of test runners in `testFailingWith`"
@@ -161,7 +165,7 @@ expectTestToFail test =
     test
         |> Test.Runner.fromTest 100 seed
         |> getRunners
-        |> List.map (\{ run } -> run ())
+        |> List.concatMap (\{ run } -> run ())
         |> List.map (\expectation () -> expectToFail expectation)
         |> (\expectations -> Expect.all expectations ())
 

tests/src/Runner/String.elm

@@ -63,7 +63,8 @@ toOutputHelp runner summary =
                Debug.log "TEST" runner.labels
        in
     -}
-    fromExpectation runner.labels (runner.run ()) summary
+    runner.run ()
+        |> List.foldl (fromExpectation runner.labels) summary
 
 
 fromExpectation : List String -> Expectation -> Summary -> Summary

tests/src/RunnerTests.elm

@@ -197,7 +197,8 @@ fromTest =
                     case toSeededRunners (test "crashes" <| \() -> Debug.todo "crash") of
                         Plain [ runner ] ->
                             runner.run ()
-                                |> Test.Runner.getFailureReason
+                                |> List.head
+                                |> Maybe.andThen Test.Runner.getFailureReason
                                 |> Expect.equal
                                     (Just
                                         { given = Nothing