json-assertions 1.0.0 → 1.0.1

raw patch · 2 files changed

+7/−8 lines, 2 filesdep −lens-aesondep ~aesondep ~lens

Dependencies removed: lens-aeson

Dependency ranges changed: aeson, lens

Files

• json-assertions.cabal +3/−4
• src/Test/JSON/Assertions.hs +4/−4

@@ -1,5 +1,5 @@ name: json-assertions-version: 1.0.0+version: 1.0.1 synopsis: Test that your (Aeson) JSON encoding matches your expectations homepage: http://github.com/ocharles/json-assertions.git license: BSD3@@ -14,12 +14,11 @@ library   exposed-modules:     Test.JSON.Assertions   build-depends:-    aeson >= 0.6,+    aeson >= 0.7 && < 0.8,     base >= 4.5 && < 5,     indexed >= 0.1,     indexed-free >= 0.3,-    lens >= 3.10,-    lens-aeson >= 0.1.2,+    lens >= 4.0 && < 4.1,     text >= 0.11.3.1   hs-source-dirs:      src   default-language:    Haskell2010

@@ -62,8 +62,8 @@ import Data.Monoid (First)  import qualified Control.Lens as Lens-import qualified Control.Lens.Aeson as Aeson import qualified Data.Aeson as Aeson+import qualified Data.Aeson.Lens as Aeson import qualified Data.Text as Text  --------------------------------------------------------------------------------@@ -136,13 +136,13 @@ -- if all assertions were satisfied. testJSON :: Aeson.ToJSON i => JSONTest i j a -> i -> [String] testJSON tests env = go tests (Aeson.toJSON env) env "subject"- +  where    go :: JSONTest i j a -> Aeson.Value -> i -> String -> [String]- +   go (Pure _) _ _ _ = []- +   go (Free (Key keyS f k)) actual expected descr =     tryLens (Aeson.key (Text.pack keyS)) f actual expected k $       descr ++ "[\"" ++ keyS ++ "\"]"