diff --git a/Gruntfile.js b/Gruntfile.js index be6b4e412..14ce8fac2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -90,7 +90,6 @@ module.exports = function( grunt ) { "test/reorder.html", "test/reorderError1.html", "test/reorderError2.html", - "test/reporter-urlparams-hidepassed.html", "test/reporter-urlparams.html", "test/sandboxed-iframe.html", "test/seed.html", @@ -101,6 +100,7 @@ module.exports = function( grunt ) { "test/urlparams-testId.html", "test/webWorker.html", + "test/reporter-html/hidepassed.html?hidepassed=true", "test/reporter-html/legacy-markup.html", "test/reporter-html/no-qunit-element.html", "test/reporter-html/config-testId.html", diff --git a/test/reporter-html/hidepassed.html b/test/reporter-html/hidepassed.html new file mode 100644 index 000000000..2592b64c7 --- /dev/null +++ b/test/reporter-html/hidepassed.html @@ -0,0 +1,13 @@ + + + + + QUnit + + + +
+ + + + diff --git a/test/reporter-urlparams-hidepassed.js b/test/reporter-html/hidepassed.js similarity index 51% rename from test/reporter-urlparams-hidepassed.js rename to test/reporter-html/hidepassed.js index fbee86323..880445894 100644 --- a/test/reporter-urlparams-hidepassed.js +++ b/test/reporter-html/hidepassed.js @@ -2,7 +2,7 @@ if ( !location.search ) { location.replace( "?hidepassed=true" ); } -QUnit.module( "urlParams hidepassed module", function() { +QUnit.module( "hidepassed", function() { QUnit.test( "passed 1", function( assert ) { assert.true( true ); } ); @@ -12,22 +12,22 @@ QUnit.module( "urlParams hidepassed module", function() { QUnit.test( "passed 3", function( assert ) { assert.true( true ); } ); - QUnit.test( "passed 4", function( assert ) { - assert.true( true ); - } ); - QUnit.test( "passed 5", function( assert ) { - assert.true( true ); - } ); - QUnit.test( "passed 6", function( assert ) { - assert.true( true ); - } ); QUnit.skip( "skipped 1", function( assert ) { assert.true( false, "can't seem to get this working" ); } ); + QUnit.test( "passed 4", function( assert ) { - QUnit.test( "passed 7", function( assert ) { - - // we have to set it to 1 because there is currently one item being rendered, this one as it is in progress + // We expect 1 rather than 0 because the current test is in progress, + // and in-progress tests are always rendered. + // It will become hidden once it passed assert.strictEqual( document.getElementById( "qunit-tests" ).children.length, 1 ); } ); + QUnit.test( "config parsed", function( assert ) { + assert.strictEqual( QUnit.config.hidepassed, "true" ); + } ); + QUnit.test( "interface", function( assert ) { + var node = document.getElementById( "qunit-urlconfig-hidepassed" ); + assert.strictEqual( node.nodeName, "INPUT" ); + assert.strictEqual( node.checked, true ); + } ); } ); diff --git a/test/reporter-urlparams-hidepassed.html b/test/reporter-urlparams-hidepassed.html deleted file mode 100644 index 0cc1cd701..000000000 --- a/test/reporter-urlparams-hidepassed.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - QUnit URL Parameters Test Suite - - - - - -
- -