0a3b227 · typeable/servant

git.iko.soy/typeable/servant

on master help sign in

fix static file serving test

0a3b227Alp Mestanogullari10 years ago

servant-server/src/Servant/Utils/StaticFiles.hs+2

@@ -49,6 +49,8 @@ serveDirectoryWebApp :: FilePath -> Server Raw

49serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath

51-- | Same as 'serveDirectoryWebApp', but uses `defaultFileServerSettings`.

52+--

53+-- This used to be called 'serveDirectory' in @servant < 0.10@.

52serveDirectoryFileServer :: FilePath -> Server Raw

54serveDirectoryFileServer :: FilePath -> Server Raw

53serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath

55serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath

servant-server/test/Servant/Utils/StaticFilesSpec.hs+2−2

@@ -18,7 +18,7 @@ import Test.Hspec.Wai (get, shouldRespondWith, with)

18import Servant.API ((:<|>) ((:<|>)), Capture, Get, Raw, (:>), JSON)

19import Servant.Server (Server, serve)

20import Servant.ServerSpec (Person (Person))

21−import Servant.Utils.StaticFiles (serveDirectory)

21+import Servant.Utils.StaticFiles (serveDirectoryFileServer)

23type Api =

24 "dummy_api" :> Capture "person_name" String :> Get '[JSON] Person

@@ -34,7 +34,7 @@ app = serve api server

34server :: Server Api

35server =

36 (\ name_ -> return (Person name_ 42))

37− :<|> serveDirectory "static"

37+ :<|> serveDirectoryFileServer "static"

39withStaticFiles :: IO () -> IO ()

40withStaticFiles action = withSystemTempDirectory "servant-test" $ \ tmpDir ->