From 869a361d096c24ce78efdc27d37e3a6d03ef15f9 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Sun, 3 Nov 2013 12:49:15 -0800
Subject: [PATCH] Add underscore tests to sauce.

---
 .travis.yml                      |   8 ++
 test/backbone.html               |  40 +++++++++
 test/underscore.html             | 136 +++++++++++++++++++++----------
 vendor/underscore/test/arrays.js |   3 +
 4 files changed, 146 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f031b4ffa..9e43fad6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,21 +65,29 @@ script:
   - "[ $SAUCELABS != false ] && true || [ $BUILD == false ] && true || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.min.js"
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-compat-dev\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-compat-dev&compat=7\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-compat-dev\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=lodash-compat-dev\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-compat\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-compat&compat=7\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-compat\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=lodash-compat\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-modern-dev\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=modern-dev\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=modern-dev\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-modern\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-modern\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=lodash-modern\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=../dist/lodash.legacy.js\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=../dist/lodash.legacy.js&compat=7\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=../dist/lodash.legacy.js\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=../dist/lodash.legacy.js\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-legacy\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-legacy&compat=7\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-legacy\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=lodash-legacy\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=../dist/lodash.mobile.js\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=../dist/lodash.mobile.js\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=../dist/lodash.mobile.js\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/index.html?build=lodash-mobile\""
+  - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/underscore.html?build=lodash-mobile\""
   - "[ $SAUCELABS == false ] && true || node ./test/saucelabs.js \"test/backbone.html?build=lodash-mobile\""
diff --git a/test/backbone.html b/test/backbone.html
index a303eced5..ab9725175 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -33,6 +33,46 @@
 				global_test_results = results;
 			});
 
+			// skip tests we intentionally fail or those with problems
+			(function() {
+				var skipped = {
+					'Backbone.Collection': {
+						'set with many models does not overflow the stack': true
+					}
+				};
+
+				QUnit.testStart(function(details) {
+					var test = QUnit.config.current,
+					    skippedTests = skipped[details.module],
+					    skippedAsserts = skippedTests && skippedTests[details.name];
+
+					if (!skippedAsserts) {
+						return;
+					}
+					if (skippedAsserts === true) {
+						test.expected = 0;
+						test.callback = _.noop;
+						return;
+					}
+					test.finish = _.wrap(test.finish, function(func) {
+						_.each(this.assertions, function(assert) {
+							var message = _.unescape(_.result(/^<span class='test-message'>([\s\S]*?)<\/span>/.exec(assert.message), 1)),
+							    died = _.result(/^Died on test #\d+/.exec(message), 0),
+							    expected = _.unescape(_.result(/Expected: *<\/th><td><pre>([\s\S]*?)<\/pre>/.exec(assert.message), 1));
+
+							if ((message && _.contains(skippedAsserts, message)) ||
+							    (died && _.contains(skippedAsserts, died)) ||
+							    (expected && (_.contains(skippedAsserts, expected) ||
+									  _.contains(skippedAsserts, expected.replace(/\s+/g, '')))
+							    )) {
+							  assert.result = true;
+							}
+						});
+						func.call(this);
+					});
+				});
+			}());
+
 			// load Lo-Dash again to overwrite the existing `_` value
 			document.write('<script src="' + ui.buildPath + '"><\/script>');
 		</script>
diff --git a/test/underscore.html b/test/underscore.html
index 4d31aec1e..67eb7d70f 100644
--- a/test/underscore.html
+++ b/test/underscore.html
@@ -24,51 +24,104 @@
 		<script src="../vendor/platform.js/platform.js"></script>
 		<script src="./asset/test-ui.js"></script>
 		<script>
-			function init(lodash) {
-				var arrayRef = [],
-				    push = arrayRef.push;
-
-				if (!lodash().map()) {
-					return;
-				}
-				lodash.mixin = function(object) {
-					lodash.forEach(lodash.functions(object), function(methodName) {
-						var func = lodash[methodName] = object[methodName];
-						lodash.prototype[methodName] = function() {
-							var args = [this.__wrapped__];
-							push.apply(args, arguments);
-
-							var result = func.apply(lodash, args);
-							if (this.__chain__) {
-								result = new lodash(result);
-								result.__chain__ = true;
-							}
-							return result;
-						};
-					});
-				};
-
-				lodash.forEach(['pop', 'shift'], function(methodName) {
-					var func = arrayRef[methodName];
-					lodash.prototype[methodName] = function() {
-						func.apply(this.__wrapped__, arguments);
-						return this;
-					};
-				});
-
-
-				lodash.mixin(lodash);
-
-				// expose lodash
-				window._ = lodash;
-			}
-
 			// assign results to `global_test_results` for Sauce Labs
 			var global_test_results;
 			QUnit.done(function(results) {
 				global_test_results = results;
 			});
 
+			// skip tests we intentionally fail or those with problems
+			(function() {
+				var skipped = {
+					'Arrays': {
+						'union': [
+							'[null,1,2,3]'
+						]
+					},
+					'Chaining': {
+						'reverse/concat/unshift/pop/map': [
+							'"34, 10, 8, 6, 4, 2, 10, 10"'
+						]
+					},
+					'Collections': {
+						'reduce': [
+							'handles a null (without initial value) properly',
+							'throws an error for empty arrays with no initial value'
+						],
+						'reduceRight': [
+							'handles a null (without initial value) properly',
+							'throws an error for empty arrays with no initial value'
+						],
+						'where': [
+							'Only get the first object matched.'
+						]
+					},
+					'Functions': {
+						'bind': [
+							'Died on test #2'
+						],
+						'bindAll': [
+							'throws an error for bindAll with no functions named'
+						]
+					},
+					'Objects': {
+						'keys': [
+							'throws an error for `null` values',
+							'throws an error for `undefined` values',
+							'throws an error for number primitives',
+							'throws an error for string primitives',
+							'throws an error for boolean primitives'
+						]
+					},
+					'Utility': {
+						'_.escape': [
+							'"&lt;a href=&quot;http://moe.com&quot;&gt;Curly &amp; Moe&#x27;s&lt;/a&gt;"'
+						],
+						'_.unescape': [
+							'"<a href=\\"http://moe.com\\">Curly & Moe&#039;s</a>"'
+						]
+					}
+				};
+
+				if (/\bunderscore\b/i.test(ui.buildPath)) {
+					delete skipped.Chaining;
+					delete skipped.Collections.where;
+					delete skipped.Functions.bind;
+					delete skipped.Utility;
+				}
+
+				QUnit.testStart(function(details) {
+					var test = QUnit.config.current,
+					    skippedTests = skipped[details.module],
+					    skippedAsserts = skippedTests && skippedTests[details.name];
+
+					if (!skippedAsserts) {
+						return;
+					}
+					if (skippedAsserts === true) {
+						test.expected = 0;
+						test.callback = _.noop;
+						return;
+					}
+					test.finish = _.wrap(test.finish, function(func) {
+						_.each(this.assertions, function(assert) {
+							var message = _.unescape(_.result(/^<span class='test-message'>([\s\S]*?)<\/span>/.exec(assert.message), 1)),
+							    died = _.result(/^Died on test #\d+/.exec(message), 0),
+							    expected = _.unescape(_.result(/Expected: *<\/th><td><pre>([\s\S]*?)<\/pre>/.exec(assert.message), 1));
+
+							if ((message && _.contains(skippedAsserts, message)) ||
+							    (died && _.contains(skippedAsserts, died)) ||
+							    (expected && (_.contains(skippedAsserts, expected) ||
+									  _.contains(skippedAsserts, expected.replace(/\s+/g, '')))
+							    )) {
+							  assert.result = true;
+							}
+						});
+						func.call(this);
+					});
+				});
+			}());
+
 			// load Lo-Dash again to overwrite the existing `_` value
 			document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
 
@@ -91,7 +144,6 @@
 					curl.config({ 'apiName': 'require' });
 				}
 				if (!window.require) {
-					init(_);
 					return;
 				}
 				var reBasename = /[\w.-]+$/,
@@ -125,7 +177,9 @@
 					]
 				},
 				['lodash'], function(lodash) {
-					init(lodash);
+					if (ui.isModularize) {
+						window._ = lodash;
+					}
 					require([
 						'test/collections',
 						'test/arrays',
diff --git a/vendor/underscore/test/arrays.js b/vendor/underscore/test/arrays.js
index 3306581ad..f9ed13294 100644
--- a/vendor/underscore/test/arrays.js
+++ b/vendor/underscore/test/arrays.js
@@ -122,6 +122,9 @@ $(document).ready(function() {
     (function(){ args = arguments; })(1, 2, 3);
     result = _.union(args, [2, 30, 1], [1, 40]);
     equal(result.join(' '), '1 2 3 30 40', 'takes the union of a list of arrays');
+
+    result = _.union(null, [1, 2, 3]);
+    deepEqual(result, [null, 1, 2, 3]);
   });
 
   test("difference", function() {