From 6845a52e927c3cb8eaec97ae149017867ea6e8ca Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Mon, 16 Dec 2013 01:05:39 -0800
Subject: [PATCH] Avoid sparatic fails with Firefox 26 and amd tests.

---
 test/index.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/index.html b/test/index.html
index 255583f44..0799de37e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -162,14 +162,16 @@
 				    basePath = ('//' + location.host + location.pathname.replace(reBasename, '')).replace(/\btest\/$/, ''),
 				    modulePath = ui.buildPath.replace(/\.js$/, ''),
 				    locationPath = modulePath.replace(reBasename, ''),
-				    moduleMain = modulePath.match(reBasename)[0];
+				    moduleMain = modulePath.match(reBasename)[0],
+				    uid = +new Date;
 
 				QUnit.config.autostart = false;
 
 				function getConfig() {
 					return {
 						'baseUrl': './',
-						'urlArgs': 't=' + (+new Date),
+						'urlArgs': 't=' + uid++,
+						'waitSeconds': 0,
 						'packages': [
 							{
 								'name': 'lodash',
@@ -230,7 +232,7 @@
 				if (window.requirejs) {
 					addBizarroMethods();
 					require(getConfig(), ['lodash'], function(lodash) {
-						lodashBizarro = lodash;
+						lodashBizarro = lodash.noConflict();
 						delete requirejs.s.contexts._;
 
 						removeBizarroMethods();