@@ -10,7 +10,7 @@ import Network.HTTP.Types
1010import Network.Wai hiding (responseHeaders)
1111import Network.Wai.Handler.Warp
1212import Network.Wai.Handler.Warp.Response
13−import RunSpec (withApp, msClose, msWrite, msRead, connectTo)
13+import RunSpec (withApp, msWrite, msRead, withMySocket)
1414import Test.Hspec
1515
1616main :: IO ()
@@ -20,15 +20,13 @@ testRange :: S.ByteString -- ^ range value
2020 -> String -- ^ expected output
2121 -> Maybe String -- ^ expected content-range value
2222 -> Spec
23−testRange range out crange = it title $ withApp defaultSettings app $ \port -> do
24− ms <- connectTo port
23+testRange range out crange = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
2524 msWrite ms "GET / HTTP/1.0\r\n"
2625 msWrite ms "Range: bytes="
2726 msWrite ms range
2827 msWrite ms "\r\n\r\n"
2928 threadDelay 10000
3029 bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
31− msClose ms
3230 last bss `shouldBe` out
3331 let hs = mapMaybe toHeader bss
3432 lookup "Content-Range" hs `shouldBe` fmap ("bytes " ++) crange
@@ -46,12 +44,10 @@ testPartial :: Integer -- ^ file size
4644 -> Integer -- ^ byte count
4745 -> String -- ^ expected output
4846 -> Spec
49−testPartial size offset count out = it title $ withApp defaultSettings app $ \port -> do
50− ms <- connectTo port
47+testPartial size offset count out = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
5148 msWrite ms "GET / HTTP/1.0\r\n\r\n"
5249 threadDelay 10000
5350 bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
54− msClose ms
5551 out `shouldBe` last bss
5652 let hs = mapMaybe toHeader bss
5753 lookup "Content-Length" hs `shouldBe` Just (show $ length $ last bss)