From 3939fcf6e724131d5b748c339d8ba0b932634229 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Wed, 5 Sep 2012 07:12:35 -0700
Subject: [PATCH] Allow unit tests to run when testing custom builds without
 `noConflict`.

Former-commit-id: 2aee7eb872144583df1f22743f5d3f7102d14eae
---
 test/index.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/index.html b/test/index.html
index f0893a766..6b540d456 100644
--- a/test/index.html
+++ b/test/index.html
@@ -58,12 +58,14 @@
 				}
 			},
 			['lodash', 'underscore'], function(lodash, underscore) {
-				lodashModule = lodash.noConflict();
-				lodashModule.moduleName = 'lodash';
-
-				underscoreModule = underscore.noConflict();
-				underscoreModule.moduleName = 'underscore';
-
+				if (lodash.noConflict) {
+					lodashModule = lodash.noConflict();
+					lodashModule.moduleName = 'lodash';
+				}
+				if (underscore.noConflict) {
+					underscoreModule = underscore.noConflict();
+					underscoreModule.moduleName = 'underscore';
+				}
 				require(['test.js']);
 			});