Skip to content

Commit

Permalink
Upgrade QUnit from v1.23.1 to v2.4.0
Browse files Browse the repository at this point in the history
Source
 https://code.jquery.com/qunit/qunit-2.4.0.js
 https://code.jquery.com/qunit/qunit-2.4.0.css

Changelog
 https://github.com/qunitjs/qunit/blob/2.4.0/History.md

This release makes 'moduleStack' private, which means we can no
longer use it to detect nested modules. Change the method of
detection to be a local 'nested' variable that we toggle in
a wrapped version of any 'executeNow' callback, in which nesting
happens.

Bug: T170515
Change-Id: Ib4ed386990125a6c713cb4351408c8f7ae7c070f
  • Loading branch information
Krinkle committed Jul 25, 2017
1 parent fd1a42d commit 2454f51
Show file tree
Hide file tree
Showing 3 changed files with 5,202 additions and 4,346 deletions.
191 changes: 161 additions & 30 deletions resources/lib/qunitjs/qunit.css
@@ -1,12 +1,12 @@
/*!
* QUnit 1.23.1
* QUnit 2.4.0
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2016-04-12T17:29Z
* Date: 2017-07-08T15:20Z
*/

/** Font Family and Sizes */
Expand All @@ -27,7 +27,7 @@
}


/** Header */
/** Header (excluding toolbar) */

#qunit-header {
padding: 0.5em 0 0.5em 1em;
Expand All @@ -52,51 +52,161 @@
color: #FFF;
}

#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0 0.5em 0 0.1em;
}

#qunit-banner {
height: 5px;
}

#qunit-testrunner-toolbar {
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;
background-color: #F4FF77;
}

#qunit-userAgent {
padding: 0.5em 1em 0.5em 1em;
background-color: #2B81AF;
color: #FFF;
background-color: #2B81AF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
}

#qunit-modulefilter-container {
float: right;
padding: 0.2em;

/** Toolbar */

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

#qunit-testrunner-toolbar .clearfix {
height: 0;
clear: both;
}

.qunit-url-config {
#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0.1em;
}

.qunit-filter {
display: block;
#qunit-testrunner-toolbar input[type=checkbox],
#qunit-testrunner-toolbar input[type=radio] {
margin: 3px;
vertical-align: -2px;
}

#qunit-testrunner-toolbar input[type=text] {
box-sizing: border-box;
height: 1.6em;
}

.qunit-url-config,
.qunit-filter,
#qunit-modulefilter {
display: inline-block;
line-height: 2.1em;
}

.qunit-filter,
#qunit-modulefilter {
float: right;
position: relative;
margin-left: 1em;
}

.qunit-url-config label {
margin-right: 0.5em;
}

#qunit-modulefilter-search {
box-sizing: border-box;
width: 400px;
}

#qunit-modulefilter-search-container:after {
position: absolute;
right: 0.3em;
content: "\25bc";
color: black;
}

#qunit-modulefilter-dropdown {
/* align with #qunit-modulefilter-search */
box-sizing: border-box;
width: 400px;
position: absolute;
right: 0;
top: 50%;
margin-top: 0.8em;

border: 1px solid #D3D3D3;
border-top: none;
border-radius: 0 0 .25em .25em;
color: #000;
background-color: #F5F5F5;
z-index: 99;
}

#qunit-modulefilter-dropdown a {
color: inherit;
text-decoration: none;
}

#qunit-modulefilter-dropdown .clickable.checked {
font-weight: bold;
color: #000;
background-color: #D2E0E6;
}

#qunit-modulefilter-dropdown .clickable:hover {
color: #FFF;
background-color: #0D3349;
}

#qunit-modulefilter-actions {
display: block;
overflow: auto;

/* align with #qunit-modulefilter-dropdown-list */
font: smaller/1.5em sans-serif;
}

#qunit-modulefilter-dropdown #qunit-modulefilter-actions > * {
box-sizing: border-box;
max-height: 2.8em;
display: block;
padding: 0.4em;
}

#qunit-modulefilter-dropdown #qunit-modulefilter-actions > button {
float: right;
font: inherit;
}

#qunit-modulefilter-dropdown #qunit-modulefilter-actions > :last-child {
/* insert padding to align with checkbox margins */
padding-left: 3px;
}

#qunit-modulefilter-dropdown-list {
max-height: 200px;
overflow-y: auto;
margin: 0;
border-top: 2px groove threedhighlight;
padding: 0.4em 0 0;
font: smaller/1.5em sans-serif;
}

#qunit-modulefilter-dropdown-list li {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

#qunit-modulefilter-dropdown-list .clickable {
display: block;
padding-left: 0.15em;
}


/** Tests: Pass/Fail */

#qunit-tests {
Expand All @@ -116,7 +226,8 @@
#qunit-tests li.running,
#qunit-tests li.pass,
#qunit-tests li.fail,
#qunit-tests li.skipped {
#qunit-tests li.skipped,
#qunit-tests li.aborted {
display: list-item;
}

Expand All @@ -125,7 +236,7 @@
}

#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
#qunit-tests.hidepass li.pass:not(.todo) {
visibility: hidden;
position: absolute;
width: 0;
Expand Down Expand Up @@ -202,14 +313,14 @@
}

#qunit-tests del {
background-color: #E0F2BE;
color: #374E0C;
background-color: #E0F2BE;
text-decoration: none;
}

#qunit-tests ins {
background-color: #FFCACA;
color: #500;
background-color: #FFCACA;
text-decoration: none;
}

Expand Down Expand Up @@ -264,12 +375,16 @@

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


/*** Aborted tests */
#qunit-tests .aborted { color: #000; background-color: orange; }
/*** Skipped tests */

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

#qunit-tests .qunit-todo-label,
#qunit-tests .qunit-skipped-label {
background-color: #F4FF77;
display: inline-block;
Expand All @@ -280,19 +395,35 @@
margin: -0.4em 0.4em -0.4em 0;
}

#qunit-tests .qunit-todo-label {
background-color: #EEE;
}

/** Result */

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

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

border-bottom: 1px solid #FFF;
}
#qunit-testresult .clearfix {
height: 0;
clear: both;
}
#qunit-testresult .module-name {
font-weight: 700;
}
#qunit-testresult-display {
padding: 0.5em 1em 0.5em 1em;
width: 85%;
float:left;
}
#qunit-testresult-controls {
padding: 0.5em 1em 0.5em 1em;
width: 10%;
float:left;
}

/** Fixture */

Expand Down

0 comments on commit 2454f51

Please sign in to comment.