git.iko.soy/typeable/wai
on master help sign in
Merge pull request #677 from jkarni/jkarni/fixTestWithApplcationSettings

Unignore settings in testWithApplicationSettings.

commit638a446e727417dd6880fba83ad65facc78dff5c authorMichael Snoyman <michael@snoyman.com> dateWed 7 Mar 2018, 12:11 (9 years ago) parent2cec9996fc59d1
3 files changed+8−3
compare with master
unifiedsplit
warp/ChangeLog.md+5 warp/Network/Wai/Handler/Warp/WithApplication.hs+2−2 warp/warp.cabal+1−1
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+
16## 3.2.16
27
38* In `testWithApplication`, don't `throwTo` ignorable exceptions
warp/Network/Wai/Handler/Warp/WithApplication.hs+2−2
@@ -68,7 +68,7 @@ testWithApplication = testWithApplicationSettings defaultSettings
6868--
6969-- @since 3.2.7
7070testWithApplicationSettings :: Settings -> IO Application -> (Port -> IO a) -> IO a
71−testWithApplicationSettings _settings mkApp action = do
71+testWithApplicationSettings settings mkApp action = do
7272 callingThread <- myThreadId
7373 app <- mkApp
7474 let wrappedApp request respond =
@@ -77,7 +77,7 @@ testWithApplicationSettings _settings mkApp action = do
7777 (defaultShouldDisplayException e)
7878 (throwTo callingThread e)
7979 throwIO e
80− withApplication (return wrappedApp) action
80+ withApplicationSettings settings (return wrappedApp) action
8181
8282data Waiter a
8383 = Waiter {
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 3.2.17
2+Version: 3.2.18
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE