Merge from upstream; update dependencies; bump version to 0.4.0 #11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
there was lots of extra `,`'s
…le instead of only on a qunit test target
When force is true, upon completion of all tests, test failures will not cause the whole task to fail, in either the case of a negative assertion, or when there were no assertions at all. This can be set to true when you always want other tasks in the queue to be executed. This is effectively implements --force at a task-specific level, where it is common to want to continue even when tests fail. Certain PhantomJS error conditions have also been changed to raise test failures rather than exiting the task immediately.
…breaks. This reverts commit 72feaff.
They can then be handled in Gruntfile.js using
grunt.event.on('qunit.error.onError', function (msg, stack) { ... })
Update to latest phantom dependency.
Removing Confusing Error Message
Update to latest phantom dependency.
…:gruntjs/grunt-contrib-qunit into merge-upstream * github.com:gruntjs/grunt-contrib-qunit: (26 commits) 0.4.0 Update grunt-lib-phantomjs to v0.5.0. Explicitly set files to publish to npm. Ref gruntjs/gruntjs.com#65 Update qunit-overview.md, include CentOS dependencies. Closes asciidiscogh-49 0.3.0 Fixes asciidiscoGH-47. Update to latest phantom dependency. Remove Gruntfile.js as main in package.json removing confusing error message Propagate error.onError events from Phantom. Closes asciidiscoGH-11. Update README Update readme to document PhantomJS OS dependencies. Fixes asciidisco#43 Revert "Cleanup trailing whitespace in docs". Necessary for hard linebreaks. Cleanup trailing whitespace in docs Add `force` option Update QUnit to latest; cleanup QUnit markup Add new events for fail conditions, so that reporters can still report on the test Bump v0.2.2 Remove broken link in docs Update devDeps Update copyright ... Conflicts: README.md package.json phantomjs/bridge.js tasks/qunit.js
jgerigmeyer
added a commit
that referenced
this pull request
Mar 16, 2014
Merge from upstream; update dependencies; bump version to 0.4.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.