git.iko.soy/servant
on master help sign in
Merge pull request #653 from phadej/aeson-1.1
875f592Alp Mestanogullari
servant-client/servant-client.cabal+1−1
compare with master
unifiedsplit
@@ -37,7 +37,7 @@ library
37 build-depends:
37 build-depends:
38 base >= 4.7 && < 4.10
38 base >= 4.7 && < 4.10
39 , base-compat >= 0.9.1 && < 0.10
39 , base-compat >= 0.9.1 && < 0.10
40− , aeson >= 0.7 && < 1.1
40+ , aeson >= 0.7 && < 1.2
41 , attoparsec >= 0.12 && < 0.14
41 , attoparsec >= 0.12 && < 0.14
42 , base64-bytestring >= 1.0.0.1 && < 1.1
42 , base64-bytestring >= 1.0.0.1 && < 1.1
43 , bytestring >= 0.10 && < 0.11
43 , bytestring >= 0.10 && < 0.11
servant-server/servant-server.cabal+2−2
@@ -47,7 +47,7 @@ library
47 build-depends:
47 build-depends:
48 base >= 4.7 && < 4.10
48 base >= 4.7 && < 4.10
49 , base-compat >= 0.9 && < 0.10
49 , base-compat >= 0.9 && < 0.10
50− , aeson >= 0.7 && < 1.1
50+ , aeson >= 0.7 && < 1.2
51 , attoparsec >= 0.12 && < 0.14
51 , attoparsec >= 0.12 && < 0.14
52 , base64-bytestring >= 1.0 && < 1.1
52 , base64-bytestring >= 1.0 && < 1.1
53 , bytestring >= 0.10 && < 0.11
53 , bytestring >= 0.10 && < 0.11
@@ -117,7 +117,7 @@ test-suite spec
117 , directory
117 , directory
118 , exceptions
118 , exceptions
119 , hspec == 2.*
119 , hspec == 2.*
120− , hspec-wai
120+ , hspec-wai >= 0.8 && <0.9
121 , http-types
121 , http-types
122 , network >= 2.6
122 , network >= 2.6
123 , QuickCheck
123 , QuickCheck
servant-server/test/Servant/Server/ErrorSpec.hs+8−2
@@ -211,11 +211,17 @@ errorRetrySpec =
211
211
212 it "should continue when URLs don't match" $ do
212 it "should continue when URLs don't match" $ do
213 request methodPost "" [jsonCT, jsonAccept] jsonBody
213 request methodPost "" [jsonCT, jsonAccept] jsonBody
214− `shouldRespondWith` 200 { matchBody = Just $ encode (8 :: Int) }
214+ `shouldRespondWith` 200 { matchBody = mkBody $ encode (8 :: Int) }
215
215
216 it "should continue when methods don't match" $ do
216 it "should continue when methods don't match" $ do
217 request methodGet "a" [jsonCT, jsonAccept] jsonBody
217 request methodGet "a" [jsonCT, jsonAccept] jsonBody
218− `shouldRespondWith` 200 { matchBody = Just $ encode (4 :: Int) }
218+ `shouldRespondWith` 200 { matchBody = mkBody $ encode (4 :: Int) }
219+ where
220+ mkBody b = MatchBody $ \_ b' ->
221+ if b == b'
222+ then Nothing
223+ else Just "body not correct\n"
224+
219
225
220-- }}}
226-- }}}
221------------------------------------------------------------------------------
227------------------------------------------------------------------------------
servant/servant.cabal+1−1
@@ -51,7 +51,7 @@ library
51 build-depends:
51 build-depends:
52 base >= 4.7 && < 4.10
52 base >= 4.7 && < 4.10
53 , base-compat >= 0.9 && < 0.10
53 , base-compat >= 0.9 && < 0.10
54− , aeson >= 0.7 && < 1.1
54+ , aeson >= 0.7 && < 1.2
55 , attoparsec >= 0.12 && < 0.14
55 , attoparsec >= 0.12 && < 0.14
56 , bytestring >= 0.10 && < 0.11
56 , bytestring >= 0.10 && < 0.11
57 , case-insensitive >= 1.2 && < 1.3
57 , case-insensitive >= 1.2 && < 1.3
stack-ghc-7.8.4.yaml+6−4
@@ -11,10 +11,12 @@ extra-deps:
11- control-monad-omega-0.3.1
11- control-monad-omega-0.3.1
12- cryptonite-0.6
12- cryptonite-0.6
13- doctest-0.11.0
13- doctest-0.11.0
14−- hspec-2.2.3
14+- hspec-2.3.2
15+- hspec-discover-2.3.2
15−- hspec-core-2.2.3
16+- hspec-core-2.3.2
16−- hspec-discover-2.2.3
17+- hspec-wai-0.8.0
17−- hspec-expectations-0.7.2
18+- hspec-expectations-0.8.2
19+- call-stack-0.1.0
18- http-api-data-0.3
20- http-api-data-0.3
19- natural-transformation-0.4
21- natural-transformation-0.4
20- primitive-0.6.1.0
22- primitive-0.6.1.0
stack-ghc-8.0.1.yaml+2−4
@@ -1,4 +1,4 @@
1−resolver: nightly-2016-05-27
1+resolver: nightly-2016-12-31
2packages:
2packages:
3- servant/
3- servant/
4- servant-client/
4- servant-client/
@@ -6,7 +6,5 @@ packages:
6- servant-foreign/
6- servant-foreign/
7- servant-server/
7- servant-server/
8extra-deps:
8extra-deps:
9−- http-api-data-0.3
9+- aeson-1.1.0.0
10−- uri-bytestring-0.2.2.0
11−- natural-transformation-0.4
12flags: {}
10flags: {}
stack.yaml+6
@@ -10,4 +10,10 @@ extra-deps:
10- http-api-data-0.3
10- http-api-data-0.3
11- servant-js-0.9 # needed for tutorial
11- servant-js-0.9 # needed for tutorial
12- natural-transformation-0.4
12- natural-transformation-0.4
13+- hspec-2.3.2
14+- hspec-discover-2.3.2
15+- hspec-core-2.3.2
16+- hspec-wai-0.8.0
17+- hspec-expectations-0.8.2
18+- call-stack-0.1.0
13resolver: lts-6.0
19resolver: lts-6.0