Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Global Mocha timeout #972

Merged
merged 1 commit into from
Oct 13, 2015
Merged

Conversation

mleanos
Copy link
Member

@mleanos mleanos commented Oct 10, 2015

Added the timeout option to the Mocha grunt task; set to 10000.

Removed the individual test suite timeouts, for all server tests.

As discussed in #964

@ilanbiala
Copy link
Member

@mleanos just merge the Grunt and Gulp PRs together.

@mleanos
Copy link
Member Author

mleanos commented Oct 11, 2015

@ilanbiala Ok, will do. I just thought we were keeping Grunt & Gulp separate since we're not officially supporting Gulp.

Added the timeout option to the Mocha grunt task; set to 10000.

Removed the individual test suite timeouts, for all server tests.

Also, added global timeout for Mocha gulp task.
@mleanos mleanos force-pushed the mocha-global-timeout-grunt branch from 882c056 to 037878b Compare October 11, 2015 06:54
@mleanos
Copy link
Member Author

mleanos commented Oct 11, 2015

@ilanbiala Combined the Gulp change into this PR.

@vaucouleur
Copy link
Contributor

LGTM (grunt & gulp test-ed). Thanks.

@lirantal lirantal self-assigned this Oct 11, 2015
@lirantal lirantal added this to the 0.4.2 milestone Oct 11, 2015
@lirantal
Copy link
Member

@ilanbiala I think we can add it as part of 0.4.2, you have any objections?

@ilanbiala
Copy link
Member

LGTM. 👍

@codydaig
Copy link
Member

LGTM

lirantal added a commit that referenced this pull request Oct 13, 2015
@lirantal lirantal merged commit 8a12f76 into meanjs:master Oct 13, 2015
@mleanos
Copy link
Member Author

mleanos commented Oct 13, 2015

Thank you @lirantal

@vaucouleur Thanks for the suggestion.

@mleanos mleanos deleted the mocha-global-timeout-grunt branch October 13, 2015 06:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants