From 7726b5c56b2d1929df867d2ea6ca901edef4b44c Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Mon, 16 Sep 2013 23:57:01 -0700
Subject: [PATCH] Add more bad shim tests.

---
 test/index.html | 22 ++++++++++++++++++++--
 test/test.js    | 34 +++++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/test/index.html b/test/index.html
index 1059917c2..2b0d95557 100644
--- a/test/index.html
+++ b/test/index.html
@@ -17,7 +17,16 @@
 		<div id="qunit"></div>
 		<div id="exports"></div>
 		<script>
-			// set a bad shim
+			// set bad shims
+			Array._isArray = Array.isArray;
+			Array.isArray = function() { return false; };
+
+			Function.prototype._bind = Function.prototype.bind;
+			Function.prototype.bind = function() { return function() {}; };
+
+			Object._defineProperty = Object.defineProperty;
+			Object.defineProperty = function() {};
+
 			Object._keys = Object.keys;
 			Object.keys = function() { return []; };
 
@@ -28,7 +37,16 @@
 			// store Lo-Dash to test for bad shim detection
 			var lodashBadShim = window._;
 
-			// restore nativeKeys
+			// restore native methods
+			Array.isArray = Array._isArray;
+			delete Array._isArray;
+
+			Function.prototype.bind = Function.prototype._bind;
+			delete Function.prototype._bind;
+
+			Object.defineProperty = Object._defineProperty;
+			delete Object._defineProperty;
+
 			Object.keys = Object._keys;
 			delete Object._keys;
 
diff --git a/test/test.js b/test/test.js
index 35db3b4e1..41ec36045 100644
--- a/test/test.js
+++ b/test/test.js
@@ -255,10 +255,30 @@
     });
 
     test('avoids overwritten native methods', function() {
+      function message(methodName) {
+        return '`_.' + methodName + '` should avoid overwritten native methods';
+      }
+
+      var object = { 'a': true };
+
       if (document) {
-        notDeepEqual(lodashBadShim.keys({ 'a': 1 }), []);
-      } else {
-        skipTest();
+        try {
+          var actual = lodashBadShim.bind(function() { return this.a; }, object)();
+        } catch(e) { }
+        ok(actual, message('bind'));
+
+        try {
+          actual = lodashBadShim.isArray([]);
+        } catch(e) { }
+        ok(actual, message('isArray'));
+
+        try {
+          actual = lodashBadShim.keys(object);
+        } catch(e) { }
+        deepEqual(actual, ['a'], message('keys'));
+      }
+      else {
+        skipTest(3);
       }
     });
   }());
@@ -604,7 +624,7 @@
       });
 
       test('`_.' + methodName + '` should handle cloning if `callback` returns `undefined`', function() {
-        var actual = _.clone({ 'a': { 'b': 'c' } }, function() { });
+        var actual = _.clone({ 'a': { 'b': 'c' } }, function() {});
         deepEqual(actual, { 'a': { 'b': 'c' } });
       });
     });
@@ -2077,7 +2097,7 @@
     });
 
     test('should handle comparisons if `callback` returns `undefined`', function() {
-      var actual = _.isEqual('a', 'a', function() { });
+      var actual = _.isEqual('a', 'a', function() {});
       strictEqual(actual, true);
     });
 
@@ -2596,7 +2616,7 @@
     });
 
     test('should handle merging if `callback` returns `undefined`', function() {
-      var actual = _.merge({ 'a': { 'b': [1, 1] } }, { 'a': { 'b': [0] } }, function() { });
+      var actual = _.merge({ 'a': { 'b': [1, 1] } }, { 'a': { 'b': [0] } }, function() {});
       deepEqual(actual, { 'a': { 'b': [0, 1] } });
     });
 
@@ -4437,7 +4457,7 @@
         _.forEach(falsey, function(value, index) {
           try {
             actual.push(index ? func(value) : func());
-          } catch(e) { console.log(e)}
+          } catch(e) { }
         });
 
         deepEqual(actual, expected);