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

QUnit 1.16 #1654

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Expand Up @@ -57,7 +57,7 @@ module.exports = function( grunt ) {

"qunit/qunit.js": "qunitjs/qunit/qunit.js",
"qunit/qunit.css": "qunitjs/qunit/qunit.css",
"qunit/MIT-LICENSE.txt": "qunitjs/MIT-LICENSE.txt",
"qunit/LICENSE.txt": "qunitjs/LICENSE.txt",

"requirejs/require.js": "requirejs/require.js",

Expand Down
20 changes: 18 additions & 2 deletions external/qunit/MIT-LICENSE.txt → external/qunit/LICENSE.txt
@@ -1,5 +1,14 @@
Copyright 2013 jQuery Foundation and other contributors
http://jquery.com/
Copyright 2006, 2014 jQuery Foundation and other contributors,
https://jquery.org/

This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/qunit

The following license applies to all parts of this software except as
documented below:

====

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand All @@ -19,3 +28,10 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

====

All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.
41 changes: 34 additions & 7 deletions external/qunit/qunit.css
@@ -1,12 +1,12 @@
/*!
* QUnit 1.14.0
* QUnit 1.16.0
* http://qunitjs.com/
*
* Copyright 2013 jQuery Foundation and other contributors
* Copyright 2006, 2014 jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2014-01-31T16:40Z
* Date: 2014-12-03T16:32Z
*/

/** Font Family and Sizes */
Expand Down Expand Up @@ -62,14 +62,14 @@
}

#qunit-testrunner-toolbar {
padding: 0.5em 0 0.5em 2em;
padding: 0.5em 1em 0.5em 1em;
color: #5E740B;
background-color: #EEE;
overflow: hidden;
}

#qunit-userAgent {
padding: 0.5em 0 0.5em 2.5em;
padding: 0.5em 1em 0.5em 1em;
background-color: #2B81AF;
color: #FFF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
Expand All @@ -86,11 +86,19 @@
}

#qunit-tests li {
padding: 0.4em 0.5em 0.4em 2.5em;
padding: 0.4em 1em 0.4em 1em;
border-bottom: 1px solid #FFF;
list-style-position: inside;
}

#qunit-tests > li {
display: none;
}

#qunit-tests li.pass, #qunit-tests li.running, #qunit-tests li.fail {
display: list-item;
}

#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
display: none;
}
Expand All @@ -99,6 +107,10 @@
cursor: pointer;
}

#qunit-tests li.skipped strong {
cursor: default;
}

#qunit-tests li a {
padding: 0.5em;
color: #C2CCD1;
Expand Down Expand Up @@ -211,11 +223,26 @@

#qunit-banner.qunit-fail { background-color: #EE5757; }

/*** Skipped tests */

#qunit-tests .skipped {
background-color: #EBECE9;
}

#qunit-tests .qunit-skipped-label {
background-color: #F4FF77;
display: inline-block;
font-style: normal;
color: #366097;
line-height: 1.8em;
padding: 0 0.5em;
margin: -0.4em 0.4em -0.4em 0;
}

/** Result */

#qunit-testresult {
padding: 0.5em 0.5em 0.5em 2.5em;
padding: 0.5em 1em 0.5em 1em;

color: #2B81AF;
background-color: #D2E0E6;
Expand Down