Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add {test,}withApplicationSettings #531

Merged
merged 1 commit into from Apr 13, 2016
Merged

Add {test,}withApplicationSettings #531

merged 1 commit into from Apr 13, 2016

Conversation

utdemir
Copy link
Contributor

@utdemir utdemir commented Apr 12, 2016

withApplication was using defaultSettings implicitly, this patch implements withApplicationSettings and testWithApplicationSettings functions that run Application's with given Settings.

Without this patch, I was unable to increase Warp's timeout on testWithApplication.

withApplication mkApp action = do
withApplication = withApplicationSettings defaultSettings

-- | 'withApplication' with given 'Settings'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's worth including a note that any port provided in the Settings value would be ignored.

Also, can you add a @since comment for version 3.2.7 to this and the function added below, and update the ChangeLog.md file?

@utdemir
Copy link
Contributor Author

utdemir commented Apr 12, 2016

@snoyberg I updated the PR, can you check again if everything is okay?

@@ -61,7 +77,7 @@ testWithApplication mkApp action = do

data Waiter a
= Waiter {
notify :: a -> IO (),
notify :: a -> IO (),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this part of the diff was accidentally added.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was stylish-haskell-mode, fixed now. Thanks.

@snoyberg
Copy link
Member

LGTM, just waiting on Travis before merging.

@snoyberg
Copy link
Member

Thanks for the quick turnaround on updating the PR.

@snoyberg snoyberg merged commit 9d4cb5f into yesodweb:master Apr 13, 2016
@snoyberg
Copy link
Member

Thanks!

snoyberg added a commit that referenced this pull request Apr 13, 2016
@kazu-yamamoto
Copy link
Contributor

Warp 3.2.7 has been released.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants