Core: Fix bad module nesting when module closure throws global error

src/module.js

@@ -61,7 +61,7 @@ function processModule( name, options, executeNow, modifiers = {} ) {
 		options = undefined;
 	}
 
-	let module = createModule( name, options, modifiers );
+	const module = createModule( name, options, modifiers );
 
 	// Move any hooks to a 'hooks' object
 	const testEnvironment = module.testEnvironment;
@@ -79,24 +79,30 @@ function processModule( name, options, executeNow, modifiers = {} ) {
 		after: setHookFunction( module, "after" )
 	};
 
-	const currentModule = config.currentModule;
+	const prevModule = config.currentModule;
+	config.currentModule = module;
+
 	if ( objectType( executeNow ) === "function" ) {
 		moduleStack.push( module );
-		config.currentModule = module;
 
-		const cbReturnValue = executeNow.call( module.testEnvironment, moduleFns );
-		if ( cbReturnValue != null && objectType( cbReturnValue.then ) === "function" ) {
-			Logger.warn( "Returning a promise from a module callback is not supported. " +
-				"Instead, use hooks for async behavior. " +
-				"This will become an error in QUnit 3.0." );
+		try {
+			const cbReturnValue = executeNow.call( module.testEnvironment, moduleFns );
+			if ( cbReturnValue != null && objectType( cbReturnValue.then ) === "function" ) {
+				Logger.warn( "Returning a promise from a module callback is not supported. " +
+					"Instead, use hooks for async behavior. " +
+					"This will become an error in QUnit 3.0." );
+			}
+		} finally {
+
+			// If the module closure threw an uncaught error during the load phase,
+			// we let this bubble up to global error handlers. But, not until after
+			// we teardown internal state to ensure correct module nesting.
+			// Ref https://github.com/qunitjs/qunit/issues/1478.
+			moduleStack.pop();
+			config.currentModule = module.parentModule || prevModule;
 		}
-
-		moduleStack.pop();
-		module = module.parentModule || currentModule;
 	}
 
-	config.currentModule = module;
-
 	function setHookFromEnvironment( hooks, environment, name ) {
 		const potentialHook = environment[ name ];
 		hooks[ name ] = typeof potentialHook === "function" ? [ potentialHook ] : [];

test/cli/fixtures/expected/tap-outputs.js

@@ -328,7 +328,7 @@ ok 3 module B > test D
 	"qunit module-nested.js":
 `TAP version 13
 ok 1 module 1 > test in module 1
-ok 2 module 2 > module 3 > test in module 3
+ok 2 module 3 > test in module 3
 1..2
 # pass 2
 # skip 0