Merge "Ability to create tests with nested modules"

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index a947484..39baf17 100644 (file)
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -63,7 +63,12 @@
        ( function () {
                var orgModule = QUnit.module;
 
-               QUnit.module = function ( name, localEnv ) {
+               QUnit.module = function ( name, localEnv, executeNow ) {
+                       if ( arguments.length === 2 && typeof localEnv === 'function' ) {
+                               executeNow = localEnv;
+                               localEnv = undefined;
+                       }
+
                        localEnv = localEnv || {};
                        orgModule( name, {
                                setup: function () {
@@ -80,9 +85,11 @@
                                                localEnv.teardown.call( this );
                                        }
 
-                                       this.sandbox.verifyAndRestore();
+                                       if ( this.sandbox ) {
+                                               this.sandbox.verifyAndRestore();
+                                       }
                                }
-                       } );
+                       }, executeNow );
                };
        }() );
 
@@ -90,8 +97,14 @@
        ( function () {
                var orgModule = QUnit.module;
 
-               QUnit.module = function ( name, localEnv ) {
+               QUnit.module = function ( name, localEnv, executeNow ) {
                        var fixture;
+
+                       if ( arguments.length === 2 && typeof localEnv === 'function' ) {
+                               executeNow = localEnv;
+                               localEnv = undefined;
+                       }
+
                        localEnv = localEnv || {};
                        orgModule( name, {
                                setup: function () {
@@ -110,7 +123,7 @@
 
                                        fixture.parentNode.removeChild( fixture );
                                }
-                       } );
+                       }, executeNow );
                };
        }() );