diff options
author | Scott González <scott.gonzalez@gmail.com> | 2013-01-31 10:19:48 -0500 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2013-01-31 10:19:48 -0500 |
commit | d36d116d360bbe54b7700b95185a6eb2069ed637 (patch) | |
tree | 81e8343d56f6aab01b60cdd56dac638e1a2e71a1 /tests | |
parent | a36012ad974edc09645962ab43c7f52f2b41c0ad (diff) | |
download | jquery-ui-d36d116d360bbe54b7700b95185a6eb2069ed637.tar.gz jquery-ui-d36d116d360bbe54b7700b95185a6eb2069ed637.zip |
Upgrade QUnit to 1.11.0. Fixes #8969 - Global test failure in Opera 12.12.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/qunit-composite.css | 24 | ||||
-rw-r--r-- | tests/unit/qunit-composite.js | 12 |
2 files changed, 23 insertions, 13 deletions
diff --git a/tests/unit/qunit-composite.css b/tests/unit/qunit-composite.css index df47362db..c530436da 100644 --- a/tests/unit/qunit-composite.css +++ b/tests/unit/qunit-composite.css @@ -1,13 +1,13 @@ -iframe.qunit-subsuite{ - position: fixed; - bottom: 0; - left: 0; - - margin: 0; - padding: 0; - border-width: 1px 0 0; - height: 45%; - width: 100%; +iframe.qunit-subsuite { + position: fixed; + bottom: 0; + left: 0; - background: #fff; -}
\ No newline at end of file + margin: 0; + padding: 0; + border-width: 1px 0 0; + height: 45%; + width: 100%; + + background: #fff; +} diff --git a/tests/unit/qunit-composite.js b/tests/unit/qunit-composite.js index b3df04217..2e5454056 100644 --- a/tests/unit/qunit-composite.js +++ b/tests/unit/qunit-composite.js @@ -16,8 +16,15 @@ QUnit.extend( QUnit, { }, runSuite: function( suite ) { + var path = suite; + + if ( QUnit.is( "object", suite ) ) { + path = suite.path; + suite = suite.name; + } + asyncTest( suite, function() { - QUnit.iframe.setAttribute( "src", suite ); + QUnit.iframe.setAttribute( "src", path ); }); }, @@ -33,6 +40,9 @@ QUnit.extend( QUnit, { var module, test, count = 0; + if (iframe.src === "") { + return; + } iframeWin.QUnit.moduleStart(function( data ) { // capture module name for messages |