on master help sign in
Merge pull request #677 from jkarni/jkarni/fixTestWithApplcationSettings
638a446Michael Snoyman
warp/ChangeLog.md+5
@@ -1,3 +1,8 @@
1+## 3.2.18
2+
3+* Make `testWithApplicationSettings` actually use the settings passed.
4+ [#677](https://github.com/yesodweb/wai/pull/677).
5+
1## 3.2.16
6## 3.2.16
2
7
3* In `testWithApplication`, don't `throwTo` ignorable exceptions
8* In `testWithApplication`, don't `throwTo` ignorable exceptions
warp/Network/Wai/Handler/Warp/WithApplication.hs+2−2
@@ -68,7 +68,7 @@ testWithApplication = testWithApplicationSettings defaultSettings
68--
68--
69-- @since 3.2.7
69-- @since 3.2.7
70testWithApplicationSettings :: Settings -> IO Application -> (Port -> IO a) -> IO a
70testWithApplicationSettings :: Settings -> IO Application -> (Port -> IO a) -> IO a
71−testWithApplicationSettings _settings mkApp action = do
71+testWithApplicationSettings settings mkApp action = do
72 callingThread <- myThreadId
72 callingThread <- myThreadId
73 app <- mkApp
73 app <- mkApp
74 let wrappedApp request respond =
74 let wrappedApp request respond =
@@ -77,7 +77,7 @@ testWithApplicationSettings _settings mkApp action = do
77 (defaultShouldDisplayException e)
77 (defaultShouldDisplayException e)
78 (throwTo callingThread e)
78 (throwTo callingThread e)
79 throwIO e
79 throwIO e
80− withApplication (return wrappedApp) action
80+ withApplicationSettings settings (return wrappedApp) action
81
81
82data Waiter a
82data Waiter a
83 = Waiter {
83 = Waiter {
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
1Name: warp
1Name: warp
2−Version: 3.2.17
2+Version: 3.2.18
3Synopsis: A fast, light-weight web server for WAI applications.
3Synopsis: A fast, light-weight web server for WAI applications.
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE