git.iko.soy/typeable/servant
on master help sign in
fix build error for servant's spec
commit0dfd2434acc3dcaafebe86133ce9e9c1aa0c2f8f authorAlp Mestanogullari <alpmestan@gmail.com> dateThu 27 Nov 2014, 18:50 (12 years ago) parent67abcff
2 files changed−19
src/Servant/Utils/StaticFiles.hs−3 test/Servant/Utils/StaticFilesSpec.hs−16
src/Servant/Utils/StaticFiles.hs−3
@@ -6,11 +6,8 @@ module Servant.Utils.StaticFiles (
66 serveDirectory,
77 ) where
88
9−import Data.String.Conversions
109import Filesystem.Path.CurrentOS (decodeString)
11−import Network.Wai
1210import Network.Wai.Application.Static
13−
1411import Servant.API.Raw
1512import Servant.Server
1613
test/Servant/Utils/StaticFilesSpec.hs−16
@@ -6,12 +6,8 @@
66module Servant.Utils.StaticFilesSpec where
77
88import Control.Exception
9−import Data.Foldable
10−import Data.List
119import Data.Proxy
12−import Data.String.Conversions
1310import Network.Wai
14−import Network.Wai.Test
1511import System.Directory
1612import System.IO.Temp
1713import Test.Hspec hiding (pending)
@@ -22,7 +18,6 @@ import Servant.API.Capture
2218import Servant.API.Get
2319import Servant.API.Raw
2420import Servant.API.Sub
25−import Servant.Docs
2621import Servant.Server
2722import Servant.ServerSpec
2823import Servant.Utils.StaticFiles
@@ -30,10 +25,7 @@ import Servant.Utils.StaticFiles
3025type Api =
3126 "dummy_api" :> Capture "person_name" String :> Get Person
3227 :<|> "static" :> Raw
33− :<|> "documentation" :> Raw
3428
35−instance ToCapture (Capture "person_name" String) where
36− toCapture _proxy = DocCapture "person_name" "person_name_doc"
3729
3830api :: Proxy Api
3931api = Proxy
@@ -45,7 +37,6 @@ server :: Server Api
4537server =
4638 (\ name -> return (Person name 42))
4739 :<|> serveDirectory "static"
48− :<|> serveDocumentation api
4940
5041withStaticFiles :: IO () -> IO ()
5142withStaticFiles action = withSystemTempDirectory "servant-test" $ \ tmpDir ->
@@ -71,10 +62,3 @@ spec = do
7162
7263 it "serves the contents of index.html when requesting the root of a directory" $ do
7364 get "/static" `shouldRespondWith` "index"
74−
75− describe "serveDocumentation" $ do
76− it "serves documentation about the expose API" $ do
77− response <- get "/documentation"
78− liftIO $ forM_ ["person_name" :: String, "static", "dummy_api", "person_name_doc"] $
79− \ snippet ->
80− (snippet, cs (simpleBody response)) `shouldSatisfy` uncurry isInfixOf