eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix static file serving test

Browse source
This commit is contained in:
Alp Mestanogullari 2017-01-09 01:02:32 +01:00 committed by Oleg Grenrus
parent 8efabed5c6
commit 0a3b2272de
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servant-server/src/Servant/Utils/StaticFiles.hs
View file

@ -49,6 +49,8 @@ serveDirectoryWebApp :: FilePath -> Server Raw
serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath
-- | Same as 'serveDirectoryWebApp', but uses `defaultFileServerSettings`. -- | Same as 'serveDirectoryWebApp', but uses `defaultFileServerSettings`.
--
-- This used to be called 'serveDirectory' in @servant < 0.10@.
serveDirectoryFileServer :: FilePath -> Server Raw serveDirectoryFileServer :: FilePath -> Server Raw
serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath

4
servant-server/test/Servant/Utils/StaticFilesSpec.hs
View file

@ -18,7 +18,7 @@ import Test.Hspec.Wai (get, shouldRespondWith, with)
import Servant.API ((:<|>) ((:<|>)), Capture, Get, Raw, (:>), JSON) import Servant.API ((:<|>) ((:<|>)), Capture, Get, Raw, (:>), JSON)
import Servant.Server (Server, serve) import Servant.Server (Server, serve)
import Servant.ServerSpec (Person (Person)) import Servant.ServerSpec (Person (Person))
import Servant.Utils.StaticFiles (serveDirectory) import Servant.Utils.StaticFiles (serveDirectoryFileServer)
type Api = type Api =
"dummy_api" :> Capture "person_name" String :> Get '[JSON] Person "dummy_api" :> Capture "person_name" String :> Get '[JSON] Person
@ -34,7 +34,7 @@ app = serve api server
server :: Server Api server :: Server Api
server = server =
(\ name_ -> return (Person name_ 42)) (\ name_ -> return (Person name_ 42))
:<|> serveDirectory "static" :<|> serveDirectoryFileServer "static"
withStaticFiles :: IO () -> IO () withStaticFiles :: IO () -> IO ()
withStaticFiles action = withSystemTempDirectory "servant-test" $ \ tmpDir -> withStaticFiles action = withSystemTempDirectory "servant-test" $ \ tmpDir ->