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 timeout option #29

Merged
merged 4 commits into from
Apr 11, 2016
Merged

add timeout option #29

merged 4 commits into from
Apr 11, 2016

Conversation

SamVerschueren
Copy link
Collaborator

First step in implementing sindresorhus/pageres#250. Added it as an option here but we could hide it from pageres users.

Type: `number` *(seconds)*
Default: `60`

Number of seconds after which phantomjs aborts the request.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Better suggestions?

Copy link
Owner

Choose a reason for hiding this comment

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

phantomjs => PhantomJS, otherwise it looks good to me.

@SamVerschueren
Copy link
Collaborator Author

👍

@kevva
Copy link
Owner

kevva commented Apr 10, 2016

Would you mind fixing the conflicts and then we'll merge this 🚀?

@sindresorhus
Copy link
Contributor

:shipit:

@kevva kevva merged commit ea2dda2 into kevva:master Apr 11, 2016
@SamVerschueren
Copy link
Collaborator Author

@kevva Tests where still failing because of a port issue. Are you doing a fix commit then? The ports at these lines should be bumped to 9004.

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