From cd808fb5a53af3480fde43546adffe555d3b71f4 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Mon, 2 Sep 2013 00:50:07 -0500
Subject: [PATCH] Change how `lodash-modularie` build path is resolved.

---
 test/index.html      | 30 ++++++++++++++----------------
 test/test-ui.js      |  5 ++++-
 test/underscore.html |  7 ++-----
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/test/index.html b/test/index.html
index 5cf4040ab..4f7a9697a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -22,7 +22,7 @@
 			Object.keys = function() { return []; };
 
 			// load Lo-Dash and expose it to the bad `Object.keys` shim
-			document.write('<script src="' + ui.buildPath + '"><\/script>');
+			document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
 		</script>
 		<script>
 			// store Lo-Dash to test for bad shim detection
@@ -33,7 +33,7 @@
 			delete Object._keys;
 
 			// load Lo-Dash again to overwrite the existing `_` value
-			document.write('<script src="' + ui.buildPath + '"><\/script>');
+			document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
 
 			// load test.js if not using require.js
 			document.write(ui.urlParams.loader != 'none'
@@ -55,34 +55,32 @@
 				}
 				var reBasename = /[\w.-]+$/,
 				    basePath = ('//' + location.host + location.pathname).replace(/\btest\/$/, ''),
-				    isModularize = /modularize/.test(ui.urlParams.build),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),
+				    locationPath = modulePath.replace(reBasename, ''),
 				    moduleMain = modulePath.match(reBasename)[0];
 
-				var locationPath = isModularize
-					? '../modularize'
-					: modulePath.replace(reBasename, '');
-
 				QUnit.config.autostart = false;
 
 				// load Lo-Dash as a module
 				require({
 					'baseUrl': './',
 					'urlArgs': 't=' + (+new Date),
-					'paths': {
-						'shimmed': './abc/../' + modulePath,
-						'underscore': './xyz/../' + modulePath
-					},
-					'aliases': [
-						['shimmed', 'lodash'],
-						['underscore', 'lodash']
-					],
 					'packages': [
 						{
 							'name': 'lodash',
 							'location': locationPath,
 							'main': moduleMain
 						},
+						{
+							'name': 'shimmed',
+							'location': './abc/../' + locationPath,
+							'main': moduleMain
+						},
+						{
+							'name': 'underscore',
+							'location': './xyz/../' + locationPath,
+							'main': moduleMain
+						},
 						{
 							'name': 'test',
 							'location': basePath + '/test',
@@ -113,7 +111,7 @@
 						lodashModule = lodash.noConflict();
 						lodashModule.moduleName = 'lodash';
 					}
-					if (isModularize) {
+					if (ui.isModularize) {
 						window._ = lodash;
 					}
 					require(['test'], function() {
diff --git a/test/test-ui.js b/test/test-ui.js
index 85bea78e8..6824ab77a 100644
--- a/test/test-ui.js
+++ b/test/test-ui.js
@@ -49,11 +49,11 @@
       case 'lodash-modern':     result = 'dist/lodash.min.js'; break;
       case 'lodash-legacy':     result = 'dist/lodash.legacy.min.js'; break;
       case 'lodash-mobile':     result = 'dist/lodash.mobile.min.js'; break;
+      case 'lodash-modularize': result = 'modularize/lodash.js'; break;
       case 'lodash-underscore': result = 'dist/lodash.underscore.min.js'; break;
       case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
       case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
       case 'lodash-compat-dev':
-      case 'lodash-modularize':
       case  undefined:          result = 'lodash.js'; break;
       default:                  return build;
     }
@@ -73,6 +73,9 @@
     return basePath + result;
   }());
 
+  // used to indicate testing a modularized build
+  ui.isModularize = /\b(?:lodash-(?:amd|node)|modularize)\b/.test(ui.buildPath);
+
   // initialize controls
   addListener(window, 'load', function() {
     function eventHandler(event) {
diff --git a/test/underscore.html b/test/underscore.html
index 1a41d3463..546cd0521 100644
--- a/test/underscore.html
+++ b/test/underscore.html
@@ -64,7 +64,7 @@
 			}
 
 			// load Lo-Dash again to overwrite the existing `_` value
-			document.write('<script src="' + ui.buildPath + '"><\/script>');
+			document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
 
 			// load test.js if not using require.js
 			document.write(ui.urlParams.loader != 'none'
@@ -91,12 +91,9 @@
 				var reBasename = /[\w.-]+$/,
 				    basePath = ('//' + location.host + location.pathname).replace(/\btest\/$/, ''),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),
+				    locationPath = modulePath.replace(reBasename, ''),
 				    moduleMain = modulePath.match(reBasename)[0];
 
-				var locationPath = /modularize/.test(ui.urlParams.build)
-					? '../modularize'
-					: modulePath.replace(reBasename, '');
-
 				QUnit.config.autostart = false;
 
 				// load Lo-Dash as a module