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.

Sign up for GitHub

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

Jump to bottom

Add New Skip Feature #434

Closed
wants to merge 3 commits into from
Closed

Add New Skip Feature #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c2c2f6
Add skip feature
Mar 28, 2013
c2a09c1
Fix some text and style spots that I missed
Mar 28, 2013
0590f61
Use an explicit value (null) instead of undefined
Mar 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions qunit/qunit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
#qunit-tests b.counts { color: black; }
#qunit-tests b.passed { color: #5E740B; }
#qunit-tests b.failed { color: #710909; }
#qunit-tests b.skipped { color: #AFAF10; }

#qunit-tests li li {
padding: 5px;
Expand Down Expand Up @@ -218,6 +219,17 @@

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

/*** Skipped styles */

#qunit-tests li li.skip {
color: #97970F;
background-color: #fff;
border-left: 26px solid #E5EE57;
white-space: pre;
}
#qunit-tests .skip { color: #000000; background-color: #E5EE57; }
#qunit-banner.qunit-skip { background-color: #E5EE57; }


/** Result */

Expand Down
65 changes: 52 additions & 13 deletions qunit/qunit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Test.prototype = {
});
}
config.previousModule = this.module;
config.moduleStats = { all: 0, bad: 0 };
config.moduleStats = { all: 0, bad: 0, skipped: 0 };
runLoggingCallbacks( "moduleStart", QUnit, {
name: this.module
});
Expand Down Expand Up @@ -237,6 +237,7 @@ Test.prototype = {
test = this,
good = 0,
bad = 0,
skipped = 0,
tests = id( "qunit-tests" );

this.runtime = +new Date() - this.started;
Expand All @@ -251,12 +252,17 @@ Test.prototype = {
assertion = this.assertions[i];

li = document.createElement( "li" );
li.className = assertion.result ? "pass" : "fail";
li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
li.className = assertion.result === null ? "skip" : ( assertion.result ? "pass" : "fail" ); //TODO: make this support skip
li.innerHTML = assertion.message || ( assertion.result === null ? "skipped" : ( assertion.result ? "okay" : "failed" ) );
ol.appendChild( li );

//TODO: switch for skip?
if ( assertion.result ) {
good++;
} else if( assertion.result === null ) {
skipped++;
config.stats.skipped++;
config.moduleStats.skipped++;
} else {
bad++;
config.stats.bad++;
Expand All @@ -279,7 +285,7 @@ Test.prototype = {

// `b` initialized at top of scope
b = document.createElement( "strong" );
b.innerHTML = this.nameHtml + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
b.innerHTML = this.nameHtml + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, <b class='skipped'>" + skipped + "</b>, " + this.assertions.length + ")</b>";

addEvent(b, "click", function() {
var next = b.parentNode.lastChild,
Expand All @@ -304,7 +310,7 @@ Test.prototype = {

// `li` initialized at top of scope
li = id( this.id );
li.className = bad ? "fail" : "pass";
li.className = bad ? "fail" : ( skipped ? "skip" : "pass" );
li.removeChild( li.firstChild );
a = li.firstChild;
li.appendChild( b );
Expand Down Expand Up @@ -518,7 +524,7 @@ assert = {
message: msg
};

msg = escapeText( msg || (result ? "okay" : "failed" ) );
msg = escapeText( msg || ( result ? "okay" : "failed" ) );
msg = "<span class='test-message'>" + msg + "</span>";

if ( !result ) {
Expand Down Expand Up @@ -608,6 +614,37 @@ assert = {
QUnit.push( expected !== actual, actual, expected, message );
},

/**
* Marks a test with a "skipped" assertion so that you can come back later to implement or re-enable a test
* @name skip
* @function
*/
skip: function( message ) {
QUnit.push( null, null, null, message );
},

/**
* Skips the provided function if the test is true
* @name skipIf
* @function
* @example skipIf( !document.querySelectorAll, "Browser doesn't support querySelectorAll. Need a different Test", function() { QUnit.equal(!document.querySelectorAll, true); } );
*/
skipIf: function( test, message, fn ) {
if( typeof message === 'function' ) {
fn = message;
message = null;
}

//if the test passes, skip
if( test ) {
assert.skip( message );
}
//otherwise run their provided function
else if( fn && typeof fn === 'function' ) {
fn();
}
},

"throws": function( block, expected, message ) {
var actual,
expectedOutput = expected,
Expand Down Expand Up @@ -790,8 +827,8 @@ extend( QUnit, {
// Initialize the configuration options
init: function() {
extend( config, {
stats: { all: 0, bad: 0 },
moduleStats: { all: 0, bad: 0 },
stats: { all: 0, bad: 0, skipped: 0 },
moduleStats: { all: 0, bad: 0, skipped: 0 },
started: +new Date(),
updateRate: 1000,
blocking: false,
Expand Down Expand Up @@ -913,11 +950,11 @@ extend( QUnit, {
expected: expected
};

message = escapeText( message ) || ( result ? "okay" : "failed" );
message = escapeText( message ) || ( result === null ? "skipped" : ( result ? "okay" : "failed" ) );
message = "<span class='test-message'>" + message + "</span>";
output = message;

if ( !result ) {
if ( result === false ) {
expected = escapeText( QUnit.jsDump.parse(expected) );
actual = escapeText( QUnit.jsDump.parse(actual) );
output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
Expand All @@ -940,7 +977,7 @@ extend( QUnit, {
runLoggingCallbacks( "log", QUnit, details );

config.current.assertions.push({
result: !!result,
result: result,
message: output
});
},
Expand Down Expand Up @@ -1257,11 +1294,13 @@ function done() {
config.stats.all,
"</span> passed, <span class='failed'>",
config.stats.bad,
"</span> failed."
"</span> failed, <span class='skipped'>",
config.stats.skipped,
"</span> skipped."
].join( "" );

if ( banner ) {
banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
banner.className = ( config.stats.bad ? "qunit-fail" : ( config.stats.skippped ? "qunit-skip" : "qunit-pass" ) );
}

if ( tests ) {
Expand Down