Merge pull request mozilla#4 from ryanseddon/master

ArraySet.prototype.has dies when a "hasOwnProperty" property is added
ConradIrwin · Jan 19, 2012 · 3f6cbbd · 3f6cbbd
2 parents 1027610 + 0636d51
commit 3f6cbbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/source-map/array-set.js b/lib/source-map/array-set.js
@@ -49,7 +49,7 @@ define(function (require, exports, module) {
    * @param String str
    */
   ArraySet.prototype.has = function ArraySet_has(aStr) {
-    return this._set.hasOwnProperty(aStr);
+    return Object.prototype.hasOwnProperty.call(this._set, aStr);
   };
 
   /**

diff --git a/test/test-array-set.js b/test/test-array-set.js
@@ -69,12 +69,13 @@ define(function (require, exports, module) {
   };
 
   exports['test creating from an array'] = function () {
-    var set = ArraySet.fromArray(['foo', 'bar', 'baz', 'quux']);
+    var set = ArraySet.fromArray(['foo', 'bar', 'baz', 'quux', 'hasOwnProperty']);
 
     assert.ok(set.has('foo'));
     assert.ok(set.has('bar'));
     assert.ok(set.has('baz'));
     assert.ok(set.has('quux'));
+    assert.ok(set.has('hasOwnProperty'));
 
     assert.strictEqual(set.indexOf('foo'), 0);
     assert.strictEqual(set.indexOf('bar'), 1);