0a3b227 · typeable/servant

git.iko.soy/typeable/servant

fix static file serving test

commit0a3b2272debe4e6c09c5d5eb5a7c3937ee275c19 authorAlp Mestanogullari <alpmestan@gmail.com> dateMon 9 Jan 2017, 01:02 (10 years ago) parent8efabed

2 files changed+4−2

unifiedsplit

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

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

4949serveDirectoryWebApp = staticApp . defaultWebAppSettings . fixPath

5050

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

52+--

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

5254serveDirectoryFileServer :: FilePath -> Server Raw

5355serveDirectoryFileServer = staticApp . defaultFileServerSettings . fixPath

5456

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

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

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

1919import Servant.Server (Server, serve)

2020import Servant.ServerSpec (Person (Person))

21−import Servant.Utils.StaticFiles (serveDirectory)

21+import Servant.Utils.StaticFiles (serveDirectoryFileServer)

2222

2323type Api =

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

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

3434server :: Server Api

3535server =

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

37− :<|> serveDirectory "static"

37+ :<|> serveDirectoryFileServer "static"

3838

3939withStaticFiles :: IO () -> IO ()

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