From e8cfeec0cf8aa336c4ee66fbc4e0ebdbf1d72304 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Tue, 10 Jun 2014 17:33:50 -0700
Subject: [PATCH] Cleanup tests and ensure the Worker test waits no more than
 30 seconds (including retries).

---
 test/test.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/test.js b/test/test.js
index 670f5aa1b..7481656f9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -470,7 +470,7 @@
 
     asyncTest('supports loading ' + basename + ' in a web worker', 1, function() {
       if (Worker) {
-        var limit = 15000,
+        var limit = 30000 / QUnit.config.asyncRetries,
             start = +new Date;
 
         var attempt = function() {
@@ -1741,18 +1741,19 @@
 
   (function() {
     test('should create a callback with a falsey `thisArg`', 1, function() {
-      var fn = function() { return this; };
+      var fn = function() { return this; },
+          object = {};
 
       var expected = _.map(falsey, function(value) {
         var result = fn.call(value);
-        return (result && result.Array) ? root : result;
+        return (result && result.Array) ? object : result;
       });
 
       var actual = _.map(falsey, function(value) {
         var callback = _.callback(fn, value),
             result = callback();
 
-        return (result && result.Array) ? root : result;
+        return (result && result.Array) ? object : result;
       });
 
       ok(_.isEqual(actual, expected));
@@ -7071,8 +7072,8 @@
     });
 
     test('`_.' + methodName + '` creates a function that can be invoked with additional arguments', 1, function() {
-      var fn = function(a, b) { return [a, b]; },
-          expected = ['a', 'b'],
+      var expected = ['a', 'b'],
+          fn = function(a, b) { return [a, b]; },
           par = func(fn, 'a');
 
       deepEqual(par('b'), isPartial ? expected : expected.reverse());