Introducing #qunit-fixture element, deprecating the (never documented) #main element...

diff --git a/qunit/qunit.css b/qunit/qunit.css
index 47da512..ff140e0 100644 (file)
--- a/qunit/qunit.css
+++ b/qunit/qunit.css
@@ -140,4 +140,10 @@ strong b.fail{
 }
 strong b.pass{
        color:#5E740B;
-}
\ No newline at end of file
+}
+
+#qunit-fixture {
+       position: absolute;
+       top: -10000px;
+       left: -10000px;
+}

diff --git a/qunit/qunit.js b/qunit/qunit.js
index 64b62bd..a8b0967 100644 (file)
--- a/qunit/qunit.js
+++ b/qunit/qunit.js
@@ -328,8 +328,9 @@ var QUnit = {
         * Resets the test setup. Useful for tests that modify the DOM.
         */
        reset: function() {
-               if ( window.jQuery ) {
-                       jQuery("#main").html( config.fixture );
+               var main = id('main') || id('qunit-fixture');
+               if ( main ) {
+                       main.innerHTML = config.fixture;
                }
        }
 };
@@ -548,7 +549,7 @@ addEvent(window, "load", function() {
                toolbar.appendChild( label );
        }
 
-       var main = id('main');
+       var main = id('main') || id('qunit-fixture');
        if ( main ) {
                config.fixture = main.innerHTML;
        }

diff --git a/test/index.html b/test/index.html
index 8a9f865..7713ac8 100644 (file)
--- a/test/index.html
+++ b/test/index.html
@@ -13,5 +13,6 @@
        <div id="qunit-testrunner-toolbar"></div>
        <h2 id="qunit-userAgent"></h2>
        <ol id="qunit-tests"></ol>
+       <div id="qunit-fixture">test markup</div>
 </body>
 </html>

diff --git a/test/test.js b/test/test.js
index aa06d9b..2e059a5 100644 (file)
--- a/test/test.js
+++ b/test/test.js
@@ -227,3 +227,11 @@ test("raises", function() {
        raises(thrower2, 'Type!', 'throwing TypeError instance');
        raises(thrower3, 'Custom!', 'throwing custom object');
 });
+
+module("fixture");
+test("setup", function() {
+       document.getElementById("qunit-fixture").innerHTML = "foobar";
+});
+test("basics", function() {
+       equal( document.getElementById("qunit-fixture").innerHTML, "test markup", "automatically reset" );
+});