diff --git a/test/index.html b/test/index.html index 629d8958a..613c796b3 100644 --- a/test/index.html +++ b/test/index.html @@ -74,15 +74,6 @@ setProperty(String.prototype, '_contains', String.prototype.contains); setProperty(String.prototype, 'contains', String.prototype._contains ? function() {} : Boolean); - setProperty(String.prototype, '_trim', String.prototype.trim); - setProperty(String.prototype, 'trim', String.prototype._trim ? function() {} : String); - - setProperty(String.prototype, '_trimLeft', String.prototype.trimLeft); - setProperty(String.prototype, 'trimLeft', String.prototype._trimLeft ? function() {} : String); - - setProperty(String.prototype, '_trimRight', String.prototype.trimRight); - setProperty(String.prototype, 'trimRight', String.prototype._trimRight ? function() {} : String); - setProperty(window, 'WinRTError', Error); setProperty(document, '_createDocumentFragment', document.createDocumentFragment); @@ -120,19 +111,10 @@ } else { delete Object.keys; } - for (var key in { - 'contains': true, - 'trim': true, - 'trimLeft': true, - 'trimRight': true - }) { - var func = String.prototype['_' + key]; - if (func) { - setProperty(String.prototype, key, func); - } else { - delete String.prototype[key]; - } - delete String.prototype['_' + key]; + if (String.prototype._contains) { + setProperty(String.prototype, 'contains', String.prototype._contains); + } else { + delete String.prototype.contains; } setProperty(window, 'WinRTError', undefined); setProperty(Function.prototype, 'toString', Function.prototype._toString); @@ -148,6 +130,7 @@ delete Object._defineProperty; delete Object._getPrototypeOf; delete Object._keys; + delete String.prototype._contains; } // load Lo-Dash and expose it to the bad extensions/shims diff --git a/test/test.js b/test/test.js index d73f97004..c2727dfdb 100644 --- a/test/test.js +++ b/test/test.js @@ -341,15 +341,6 @@ var _contains = String.prototype.contains; setProperty(String.prototype, 'contains', _contains ? function() {} : Boolean); - var _trim = String.prototype.trim; - setProperty(String.prototype, 'trim', _trim ? function() {} : String); - - var _trimLeft = String.prototype.trimLeft; - setProperty(String.prototype, 'trimLeft', _trimLeft ? function() {} : String); - - var _trimRight = String.prototype.trimRight; - setProperty(String.prototype, 'trimRight', _trimRight ? function() {} : String); - // clear cache so Lo-Dash can be reloaded emptyObject(require.cache); @@ -365,20 +356,11 @@ setProperty(Object, 'keys', _keys); setProperty(Function.prototype, 'toString', _fnToString); - _.forOwn({ - 'contains': _contains, - 'trim': _trim, - 'trimLeft': _trimLeft, - 'trimRight': _trimRight - }, - function(func, key) { - if (func) { - setProperty(String.prototype, key, func); - } else { - delete String.prototype[key]; - } - }); - + if (_contains) { + setProperty(String.prototype, 'contains', _contains); + } else { + delete String.prototype.contains; + } delete global.window; delete global.WinRTError; delete Function.prototype._method;