Permalink
Browse files

Build: Update dependencies

Downgrade karma* while oldIe issues are worked out.
Ref gh-362
Ref 5a0dd09
  • Loading branch information...
1 parent 46ab43b commit cfc50b37e81a3453c4f0a5d2eac3f98f9009ce1b @gibson042 gibson042 committed Nov 8, 2015
View
@@ -122,15 +122,9 @@ 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",
-
- "requirejs-domready/domReady.js": "domReady/domReady.js",
- "requirejs-domready/LICENSE.txt": "domReady/LICENSE",
-
- "requirejs-text/text.js": "text/text.js",
- "requirejs-text/LICENSE.txt": "text/LICENSE"
+ "requirejs/require.js": "requirejs/require.js"
}
}
},
@@ -197,7 +191,7 @@ module.exports = function( grunt ) {
oldIe: {
browsers: browsers.old.ie,
- // Support: IE6
+ // Support: IE6 with karma<0.13
// Have to re-arrange socket.io transports by prioritizing "jsonp-polling"
// otherwise IE6 can't connect to karma server
transports: [ "jsonp-polling" ]
@@ -1,5 +1,13 @@
-Copyright 2013 jQuery Foundation and other contributors
-http://jquery.com/
+Copyright 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
@@ -19,3 +27,9 @@ 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 directory 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.
@@ -1,27 +1,27 @@
/*!
- * QUnit 1.14.0
+ * QUnit 1.20.0
* http://qunitjs.com/
*
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
- * Date: 2014-01-31T16:40Z
+ * Date: 2015-10-27T17:53Z
*/
/** Font Family and Sizes */
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
}
-#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; }
/** Resets */
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0;
padding: 0;
}
@@ -62,21 +62,39 @@
}
#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-filteredTest {
+ padding: 0.5em 1em 0.5em 1em;
+ background-color: #F4FF77;
+ color: #366097;
+}
+
#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;
}
#qunit-modulefilter-container {
float: right;
+ padding: 0.2em;
+}
+
+.qunit-url-config {
+ display: inline-block;
+ padding: 0.1em;
+}
+
+.qunit-filter {
+ display: block;
+ float: right;
+ margin-left: 1em;
}
/** Tests: Pass/Fail */
@@ -86,24 +104,51 @@
}
#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.hidepass li.pass, #qunit-tests.hidepass li.running {
+#qunit-tests > li {
display: none;
}
+#qunit-tests li.running,
+#qunit-tests li.pass,
+#qunit-tests li.fail,
+#qunit-tests li.skipped {
+ display: list-item;
+}
+
+#qunit-tests.hidepass li.running,
+#qunit-tests.hidepass li.pass {
+ visibility: hidden;
+ position: absolute;
+ width: 0;
+ height: 0;
+ padding: 0;
+ border: 0;
+ margin: 0;
+}
+
#qunit-tests li strong {
cursor: pointer;
}
+#qunit-tests li.skipped strong {
+ cursor: default;
+}
+
#qunit-tests li a {
padding: 0.5em;
color: #C2CCD1;
text-decoration: none;
}
+
+#qunit-tests li p a {
+ padding: 0.25em;
+ color: #6B6464;
+}
#qunit-tests li a:hover,
#qunit-tests li a:focus {
color: #000;
@@ -123,6 +168,10 @@
border-radius: 5px;
}
+.qunit-source {
+ margin: 0.6em 0 0.3em;
+}
+
.qunit-collapsed {
display: none;
}
@@ -211,11 +260,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;
Oops, something went wrong.

0 comments on commit cfc50b3

Please sign in to comment.