From 8028f1defd85873252231e6020fa08221dcc5a5a Mon Sep 17 00:00:00 2001 From: "Daniel P. Brice" Date: Tue, 10 May 2022 13:24:21 -0700 Subject: [PATCH 1/3] assertEq delegates to HUnit.assertEqual HUnit.assertEqual gives a formatted diff, making it easier to see the differences between the two values at a glance. --- yesod-test/Yesod/Test.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yesod-test/Yesod/Test.hs b/yesod-test/Yesod/Test.hs index f2adff40..669596a1 100644 --- a/yesod-test/Yesod/Test.hs +++ b/yesod-test/Yesod/Test.hs @@ -544,10 +544,8 @@ htmlQuery = htmlQuery' yedResponse [] -- @since 1.5.2 assertEq :: (HasCallStack, Eq a, Show a) => String -> a -> a -> YesodExample site () assertEq m a b = - liftIO $ HUnit.assertBool msg (a == b) - where msg = "Assertion: " ++ m ++ "\n" ++ - "First argument: " ++ ppShow a ++ "\n" ++ - "Second argument: " ++ ppShow b ++ "\n" + liftIO $ HUnit.assertEqual msg a b + where msg = "Assertion: " ++ m ++ "\n" -- | Asserts that the two given values are not equal. -- From d5a194a7dde7d5fa0abef14baa23004495a1ec68 Mon Sep 17 00:00:00 2001 From: "Daniel P. Brice" Date: Tue, 10 May 2022 13:25:45 -0700 Subject: [PATCH 2/3] Update yesod-test.cabal --- yesod-test/yesod-test.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 2eb8491d..699666cf 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -1,5 +1,5 @@ name: yesod-test -version: 1.6.13 +version: 1.6.14 license: MIT license-file: LICENSE author: Nubis From b8de71c5ab0ebda916d41a848bf3390538518f32 Mon Sep 17 00:00:00 2001 From: "Daniel P. Brice" Date: Tue, 10 May 2022 13:31:34 -0700 Subject: [PATCH 3/3] Update ChangeLog.md --- yesod-test/ChangeLog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yesod-test/ChangeLog.md b/yesod-test/ChangeLog.md index 1f641f2f..924ac7d5 100644 --- a/yesod-test/ChangeLog.md +++ b/yesod-test/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-test +## 1.6.14 + +* Improved failure messages from `assertEq`. [#1767](https://github.com/yesodweb/yesod/pull/1767) + ## 1.6.13 * Add `Yesod.Test.Internal.SIO` module to expose the `SIO` type.