@@ -11,22 +11,21 @@ import Control.Exception
11import Control.Monad (forM_)
11import Control.Monad (forM_)
12import Control.Monad.Trans.Control
12import Control.Monad.Trans.Control
13import Data.Aeson (ToJSON (..), Value (..), object, (.=))
13import Data.Aeson (ToJSON (..), Value (..), object, (.=))
14−import Data.Aeson qualified as A
14+import qualified Data.Aeson as A
15−import Data.Aeson.KeyMap qualified as Aeson.KeyMap
15+import qualified Data.Aeson.KeyMap as Aeson.KeyMap
16−import Data.ByteString qualified as B
16+import qualified Data.ByteString as B
17−import Data.ByteString.Lazy qualified as BL
17+import qualified Data.ByteString.Lazy as BL
18import Data.Functor.Identity (runIdentity)
18import Data.Functor.Identity (runIdentity)
19import Data.Maybe (fromJust)
19import Data.Maybe (fromJust)
20import Data.Proxy
20import Data.Proxy
21import Data.Text (Text)
21import Data.Text (Text)
22−import Data.Text qualified as T
22+import qualified Data.Text as T
23−import Data.Text.Encoding qualified as T
23+import qualified Data.Text.Encoding as T
24−import Data.Text.IO qualified as TIO
24+import qualified Data.Text.IO as TIO
25−import Network.HTTP.Client qualified as L
25+import qualified Network.HTTP.Client as L
26−import Network.HTTP.Client.MultipartFormData qualified as LM
26+import qualified Network.HTTP.Client.MultipartFormData as LM
27−import Network.HTTP.Req hiding (req)
27+import Network.HTTP.Req
28−import Network.HTTP.Req qualified as Req
29−import Network.HTTP.Types qualified as Y
28+import qualified Network.HTTP.Types as Y
30import Test.Hspec
29import Test.Hspec
31import Test.QuickCheck
30import Test.QuickCheck
@@ -34,25 +33,25 @@ spec :: Spec
35 describe "exception throwing on non-2xx status codes" $
34 describe "exception throwing on non-2xx status codes" $
36 it "throws indeed for non-2xx" $
35 it "throws indeed for non-2xx" $
37− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
36+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty
38 `shouldThrow` selector404
37 `shouldThrow` selector404
40 describe "exception throwing on non-2xx status codes (Req monad)" $
39 describe "exception throwing on non-2xx status codes (Req monad)" $
41 it "throws indeed for non-2xx" $
40 it "throws indeed for non-2xx" $
42 asIO . runReq defaultHttpConfig $
41 asIO . runReq defaultHttpConfig $
43 liftBaseWith $ \run ->
42 liftBaseWith $ \run ->
44− run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)
43+ run (req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty)
45 `shouldThrow` selector404
44 `shouldThrow` selector404
47 describe "response check via httpConfigCheckResponse" $
46 describe "response check via httpConfigCheckResponse" $
48 context "if it's set to always throw" $
47 context "if it's set to always throw" $
49 it "throws indeed" $
48 it "throws indeed" $
50− blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
49+ blindlyThrowing (req GET httpbun NoReqBody ignoreResponse mempty)
51 `shouldThrow` anyException
50 `shouldThrow` anyException
53 describe "isStatusCodeException" $
52 describe "isStatusCodeException" $
54 it "extracts non-2xx response" $
53 it "extracts non-2xx response" $
55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
54+ req GET (httpbun /: "foo") NoReqBody ignoreResponse mempty
56 `shouldThrow` selector404ByStatusCodeException
55 `shouldThrow` selector404ByStatusCodeException
58 describe "receiving user-agent header back" $
57 describe "receiving user-agent header back" $
@@ -60,7 +59,7 @@ spec = do
63− (httpbin /: "user-agent")
62+ (httpbun /: "user-agent")
65 jsonResponse
64 jsonResponse
66 (header "user-agent" "Req")
65 (header "user-agent" "Req")
@@ -75,7 +74,7 @@ spec = do
78− (httpbin /: "headers")
77+ (httpbun /: "headers")
80 jsonResponse
79 jsonResponse
81 (header "Foo" "bar" <> header "Baz" "quux")
80 (header "Foo" "bar" <> header "Baz" "quux")
@@ -93,11 +92,12 @@ spec = do
94 describe "receiving GET data back" $
93 describe "receiving GET data back" $
95 it "works" $ do
94 it "works" $ do
96− r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
95+ r <- req GET (httpbun /: "get") NoReqBody jsonResponse mempty
97 (stripFunnyHeaders . stripOrigin) (responseBody r)
96 (stripFunnyHeaders . stripOrigin) (responseBody r)
98 `shouldBe` object
97 `shouldBe` object
99 [ "args" .= emptyObject,
98 [ "args" .= emptyObject,
100− "url" .= ("http://localhost:1234/get" :: Text),
99+ "url" .= ("https://httpbun.org/get" :: Text),
100+ "method" .= ("GET" :: Text),
101 "headers"
101 "headers"
102 .= object
102 .= object
103 [ "Accept-Encoding" .= ("gzip" :: Text)
103 [ "Accept-Encoding" .= ("gzip" :: Text)
@@ -111,13 +111,14 @@ spec = do
111 it "works" $ do
111 it "works" $ do
112 let text = "foo" :: Text
112 let text = "foo" :: Text
113 reflected = reflectJSON text
113 reflected = reflectJSON text
114− r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
114+ r <- req POST (httpbun /: "post") (ReqBodyJson text) jsonResponse mempty
115 (stripFunnyHeaders . stripOrigin) (responseBody r)
115 (stripFunnyHeaders . stripOrigin) (responseBody r)
116 `shouldBe` object
116 `shouldBe` object
117 [ "args" .= emptyObject,
117 [ "args" .= emptyObject,
118 "json" .= text,
118 "json" .= text,
119 "data" .= reflected,
119 "data" .= reflected,
120− "url" .= ("http://localhost:1234/post" :: Text),
120+ "url" .= ("https://httpbun.org/post" :: Text),
121+ "method" .= ("POST" :: Text),
121 "headers"
122 "headers"
122 .= object
123 .= object
123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
124 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
@@ -138,14 +139,15 @@ spec = do
138 [ LM.partBS "foo" "foo data!",
139 [ LM.partBS "foo" "foo data!",
139 LM.partBS "bar" "bar data!"
140 LM.partBS "bar" "bar data!"
141− r <- req POST (httpbin /: "post") body jsonResponse mempty
142+ r <- req POST (httpbun /: "post") body jsonResponse mempty
142 let contentType = fromJust (getRequestContentType body)
143 let contentType = fromJust (getRequestContentType body)
143 (stripFunnyHeaders . stripOrigin) (responseBody r)
144 (stripFunnyHeaders . stripOrigin) (responseBody r)
144 `shouldBe` object
145 `shouldBe` object
145 [ "args" .= emptyObject,
146 [ "args" .= emptyObject,
146 "json" .= Null,
147 "json" .= Null,
147 "data" .= ("" :: Text),
148 "data" .= ("" :: Text),
148− "url" .= ("http://localhost:1234/post" :: Text),
149+ "url" .= ("https://httpbun.org/post" :: Text),
150+ "method" .= ("POST" :: Text),
149 "headers"
151 "headers"
150 .= object
152 .= object
151 [ "Content-Type" .= T.decodeUtf8 contentType,
153 [ "Content-Type" .= T.decodeUtf8 contentType,
@@ -166,15 +168,16 @@ spec = do
166 describe "receiving PATCHed file back" $
168 describe "receiving PATCHed file back" $
167 it "works" $ do
169 it "works" $ do
168 let file :: FilePath
170 let file :: FilePath
169− file = "httpbin-data/robots.txt"
171+ file = "httpbun-data/robots.txt"
170 contents <- TIO.readFile file
172 contents <- TIO.readFile file
171− r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
173+ r <- req PATCH (httpbun /: "patch") (ReqBodyFile file) jsonResponse mempty
172 (stripFunnyHeaders . stripOrigin) (responseBody r)
174 (stripFunnyHeaders . stripOrigin) (responseBody r)
173 `shouldBe` object
175 `shouldBe` object
174 [ "args" .= emptyObject,
176 [ "args" .= emptyObject,
175 "json" .= Null,
177 "json" .= Null,
176 "data" .= contents,
178 "data" .= contents,
177− "url" .= ("http://localhost:1234/patch" :: Text),
179+ "url" .= ("https://httpbun.org/patch" :: Text),
180+ "method" .= ("PATCH" :: Text),
178 "headers"
181 "headers"
179 .= object
182 .= object
180 [ "Accept-Encoding" .= ("gzip" :: Text),
183 [ "Accept-Encoding" .= ("gzip" :: Text),
@@ -193,13 +196,14 @@ spec = do
193 "foo" =: ("bar" :: Text)
196 "foo" =: ("bar" :: Text)
194 <> "baz" =: (5 :: Int)
197 <> "baz" =: (5 :: Int)
195 <> queryFlag "quux"
198 <> queryFlag "quux"
196− r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
199+ r <- req PUT (httpbun /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
197 (stripFunnyHeaders . stripOrigin) (responseBody r)
200 (stripFunnyHeaders . stripOrigin) (responseBody r)
198 `shouldBe` object
201 `shouldBe` object
199 [ "args" .= emptyObject,
202 [ "args" .= emptyObject,
200 "json" .= Null,
203 "json" .= Null,
201 "data" .= ("" :: Text),
204 "data" .= ("" :: Text),
202− "url" .= ("http://localhost:1234/put" :: Text),
205+ "url" .= ("https://httpbun.org/put" :: Text),
206+ "method" .= ("PUT" :: Text),
203 "headers"
207 "headers"
204 .= object
208 .= object
205 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
209 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
@@ -218,24 +222,19 @@ spec = do
218 responseStatusCode r `shouldBe` 200
222 responseStatusCode r `shouldBe` 200
219 responseStatusMessage r `shouldBe` "OK"
223 responseStatusMessage r `shouldBe` "OK"
223− describe "receiving UTF-8 encoded Unicode data" $
225+ -- describe "receiving UTF-8 encoded Unicode data" $
224− it "works" $ do
226+ -- it "works" $ do
228− (httpbin /: "encoding" /: "utf8")
230+ -- (httpbun /: "encoding" /: "utf8")
229− NoReqBody
231+ -- NoReqBody
230− bsResponse
232+ -- bsResponse
231− mempty
233+ -- mempty
232− utf8data <- B.readFile "httpbin-data/utf8.html"
234+ -- utf8data <- B.readFile "httpbun-data/utf8.html"
233− responseBody r `shouldBe` utf8data
235+ -- responseBody r `shouldBe` utf8data
234− responseStatusCode r `shouldBe` 200
236+ -- responseStatusCode r `shouldBe` 200
235− responseStatusMessage r `shouldBe` "OK"
237+ -- responseStatusMessage r `shouldBe` "OK"
240 describe "retrying" $
239 describe "retrying" $
241 it "retries as many times as specified" $ do
240 it "retries as many times as specified" $ do
@@ -246,7 +245,7 @@ spec = do
246 prepareForShit $
245 prepareForShit $
249− (httpbin /: "status" /~ status)
248+ (httpbun /: "status" /~ status)
250 NoReqBody
249 NoReqBody
251 ignoreResponse
250 ignoreResponse
@@ -258,25 +257,18 @@ spec = do
258 forM_ [400 .. 431] checkStatusCode
257 forM_ [400 .. 431] checkStatusCode
259 forM_ [500 .. 511] checkStatusCode
258 forM_ [500 .. 511] checkStatusCode
261− -- TODO /response-headers
264 describe "redirects" $
260 describe "redirects" $
265 it "follows redirects" $ do
261 it "follows redirects" $ do
269− (httpbin /: "redirect-to")
265+ (httpbun /: "redirect-to")
270 NoReqBody
266 NoReqBody
271 ignoreResponse
267 ignoreResponse
272− ("url" =: ("https://httpbin.org" :: Text))
268+ ("url" =: ("https://httpbun.org" :: Text))
273 responseStatusCode r `shouldBe` 200
269 responseStatusCode r `shouldBe` 200
274 responseStatusMessage r `shouldBe` "OK"
270 responseStatusMessage r `shouldBe` "OK"
276− -- TODO /relative-redicet
277− -- TODO /absolute-redirect
280 describe "basicAuth" $ do
272 describe "basicAuth" $ do
281 let user, password :: Text
273 let user, password :: Text
282 user = "Scooby"
274 user = "Scooby"
@@ -287,43 +279,32 @@ spec = do
287 prepareForShit $
279 prepareForShit $
290− (httpbin /: "basic-auth" /~ user /~ password)
282+ (httpbun /: "basic-auth" /~ user /~ password)
291 NoReqBody
283 NoReqBody
292 ignoreResponse
284 ignoreResponse
294 responseStatusCode r `shouldBe` 401
286 responseStatusCode r `shouldBe` 401
295− responseStatusMessage r `shouldBe` "UNAUTHORIZED"
287+ responseStatusMessage r `shouldBe` "Unauthorized"
296 context "when we provide appropriate basic auth data" $
288 context "when we provide appropriate basic auth data" $
297 it "succeeds" $ do
289 it "succeeds" $ do
301− (httpbin /: "basic-auth" /~ user /~ password)
293+ (httpbun /: "basic-auth" /~ user /~ password)
302 NoReqBody
294 NoReqBody
303 ignoreResponse
295 ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
296+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
305 responseStatusCode r `shouldBe` 200
297 responseStatusCode r `shouldBe` 200
306 responseStatusMessage r `shouldBe` "OK"
298 responseStatusMessage r `shouldBe` "OK"
308− -- TODO /hidden-basic-auth
309− -- TODO /digest-auth
316 describe "robots.txt" $
300 describe "robots.txt" $
317 it "works" $ do
301 it "works" $ do
318− r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
302+ r <- req GET (httpbun /: "robots.txt") NoReqBody bsResponse mempty
319− robots <- B.readFile "httpbin-data/robots.txt"
303+ robots <- B.readFile "httpbun-data/robots.txt"
320 responseBody r `shouldBe` robots
304 responseBody r `shouldBe` robots
321 responseStatusCode r `shouldBe` 200
305 responseStatusCode r `shouldBe` 200
322 responseStatusMessage r `shouldBe` "OK"
306 responseStatusMessage r `shouldBe` "OK"
327 describe "getting random bytes" $ do
308 describe "getting random bytes" $ do
328 it "works" $
309 it "works" $
329 property $ \n' -> do
310 property $ \n' -> do
@@ -332,7 +313,7 @@ spec = do
335− (httpbin /: "bytes" /~ n)
316+ (httpbun /: "bytes" /~ n)
336 NoReqBody
317 NoReqBody
337 lbsResponse
318 lbsResponse
@@ -348,36 +329,27 @@ spec = do
351− (httpbin /: "bytes" /~ n)
332+ (httpbun /: "bytes" /~ n)
352 NoReqBody
333 NoReqBody
353 (Proxy :: Proxy (JsonResponse Value))
334 (Proxy :: Proxy (JsonResponse Value))
355 `shouldThrow` selector
336 `shouldThrow` selector
357− describe "streaming random bytes" $
338+-- describe "streaming random bytes" $
358− it "works" $
339+-- it "works" $
359− property $ \n' -> do
340+-- property $ \n' -> do
360− let n :: Word
341+-- let n :: Word
361− n = getSmall n'
342+-- n = getSmall n'
365− (httpbin /: "stream-bytes" /~ n)
346+-- (httpbun /: "stream-bytes" /~ n)
366− NoReqBody
347+-- NoReqBody
367− bsResponse
348+-- bsResponse
369− responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
350+-- responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
370− responseStatusCode r `shouldBe` 200
351+-- responseStatusCode r `shouldBe` 200
371− responseStatusMessage r `shouldBe` "OK"
352+-- responseStatusMessage r `shouldBe` "OK"
382----------------------------------------------------------------------------
354----------------------------------------------------------------------------
383-- Instances
355-- Instances
@@ -400,29 +372,9 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
401 doit _ _ = error "Oops!"
373 doit _ _ = error "Oops!"
403−-- | 'Url' representing <https://httpbin.org>.
375+-- | 'Url' representing <https://httpbun.org>.
404−httpbin :: Url 'Http
376+httpbun :: Url 'Https
405−httpbin = http "localhost"
377+httpbun = https "httpbun.org"
411− HttpResponse response,
412− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
420−req method url body responseProxy options =
421− Req.req method url body responseProxy (options <> defaultOptions)
423−-- | Options to apply by default.
424−defaultOptions :: Option scheme
425−defaultOptions = port 1234
427-- | Remove “origin” field from JSON value. Origin may change, we don't want
379-- | Remove “origin” field from JSON value. Origin may change, we don't want
428-- to depend on that.
380-- to depend on that.
@@ -432,38 +384,21 @@ stripOrigin value = value
433-- | Remove funny headers that might break the tests.
385-- | Remove funny headers that might break the tests.
434stripFunnyHeaders :: Value -> Value
386stripFunnyHeaders :: Value -> Value
435−stripFunnyHeaders = \case
387+stripFunnyHeaders (Object m) =
439− ( Aeson.KeyMap.alterF
440− (pure . fmap stripFunnyHeaders')
447−-- | Similar to 'stripFunnyHeaders', but acts directly on the argument
448−-- without trying to access its "headers" field.
449−stripFunnyHeaders' :: Value -> Value
450−stripFunnyHeaders' = \case
453− Aeson.KeyMap.filterWithKey
388+ let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p
454− (\k _ -> k `elem` whitelistedHeaders)
456− value -> value
389+ f value = value
458− whitelistedHeaders =
459− [ "Content-Type",
391+ [ "Content-Type",
460− "Accept-Encoding",
392+ "Accept-Encoding",
461− "Content-Length",
394+ "Content-Length",
465−
398+ in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))
399+stripFunnyHeaders value = value
466−-- | This is a complete test case that makes use of <https://httpbin.org> to
401+-- | This is a complete test case that makes use of <https://httpbun.org> to
467-- get various response status codes.
402-- get various response status codes.
468checkStatusCode :: Int -> SpecWith ()
403checkStatusCode :: Int -> SpecWith ()
469checkStatusCode code =
404checkStatusCode code =
@@ -473,7 +408,7 @@ checkStatusCode code =
473 prepareForShit $
408 prepareForShit $
476− (httpbin /: "status" /~ code)
411+ (httpbun /: "status" /~ code)
477 NoReqBody
412 NoReqBody
478 ignoreResponse
413 ignoreResponse