diff options
author | Rick Waldron <waldron.rick@gmail.com> | 2012-10-15 12:31:27 -0400 |
---|---|---|
committer | Rick Waldron <waldron.rick@gmail.com> | 2012-10-15 12:31:27 -0400 |
commit | 611d7660cd23747bcc7948ad2ee2a663e00ff105 (patch) | |
tree | 847c6f4b25e12c4dfdb83b2a5fc68e3f2f7895ce | |
parent | 0c447434963bbdd6c631acfc38e51022db949a8b (diff) | |
download | jquery-611d7660cd23747bcc7948ad2ee2a663e00ff105.tar.gz jquery-611d7660cd23747bcc7948ad2ee2a663e00ff105.zip |
Remove duplicate expect. Add QUnit.config.requireExpects to testrunner.js QUnit configurations.
-rw-r--r-- | test/data/testrunner.js | 3 | ||||
-rw-r--r-- | test/unit/css.js | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/data/testrunner.js b/test/data/testrunner.js index 2a4cbf4e6..ef3a55568 100644 --- a/test/data/testrunner.js +++ b/test/data/testrunner.js @@ -156,6 +156,9 @@ function testSubproject( label, url, risTests ) { // and start()'s the next test. QUnit.config.testTimeout = 20 * 1000; // 20 seconds +// Enforce an "expect" argument or expect() call in all test bodies. +QUnit.config.requireExpects = true; + /** * Load the TestSwarm listener if swarmURL is in the address. */ diff --git a/test/unit/css.js b/test/unit/css.js index e385f03bc..894ef6a48 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -782,7 +782,7 @@ if ( jQuery.fn.offset ) { }); } -test("Do not append px to 'fill-opacity' #9548", 1, function() { +test("Do not append px to 'fill-opacity' #9548", function() { expect( 1 ); var $div = jQuery("<div>").appendTo("#qunit-fixture").css("fill-opacity", 1); @@ -791,7 +791,7 @@ test("Do not append px to 'fill-opacity' #9548", 1, function() { test("css('width') and css('height') should respect box-sizing, see #11004", function() { expect( 4 ); - + var el_dis = jQuery("<div style='width:300px;height:300px;margin:2px;padding:2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;'>test</div>"), el = el_dis.clone().appendTo("#qunit-fixture"); |