Unship unscopables and disable array.values iterators

test/mjsunit/es6/array-iterator.js

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 27 matching lines @@
   assertTrue(object.hasOwnProperty(name));
   var desc = Object.getOwnPropertyDescriptor(object, name);
   assertEquals(desc.writable, !(attrs & READ_ONLY));
   assertEquals(desc.enumerable, !(attrs & DONT_ENUM));
   assertEquals(desc.configurable, !(attrs & DONT_DELETE));
 }
 
 
 function TestArrayPrototype() {
   assertHasOwnProperty(Array.prototype, 'entries', DONT_ENUM);
-  assertHasOwnProperty(Array.prototype, 'values', DONT_ENUM);
+  // TODO(arv): Reenable once @@unscopables are shipping.
+  // assertHasOwnProperty(Array.prototype, 'values', DONT_ENUM);
   assertHasOwnProperty(Array.prototype, 'keys', DONT_ENUM);
   assertHasOwnProperty(Array.prototype, Symbol.iterator, DONT_ENUM);
 
-  assertEquals(Array.prototype.values, Array.prototype[Symbol.iterator]);
+  // TODO(arv): Reenable once @@unscopables are shipping.
+  // assertEquals(Array.prototype.values, Array.prototype[Symbol.iterator]);
 }
 TestArrayPrototype();
 
 
 function assertIteratorResult(value, done, result) {
   assertEquals({value: value, done: done}, result);
 }
 
 
 function TestValues() {
   var array = ['a', 'b', 'c'];
   var iterator = array.values();
   assertIteratorResult('a', false, iterator.next());
   assertIteratorResult('b', false, iterator.next());
   assertIteratorResult('c', false, iterator.next());
   assertIteratorResult(void 0, true, iterator.next());
 
   array.push('d');
   assertIteratorResult(void 0, true, iterator.next());
 }
-TestValues();
+// TODO(arv): Reenable once @@unscopables are shipping.
+// TestValues();
 
 
 function TestValuesMutate() {
   var array = ['a', 'b', 'c'];
   var iterator = array.values();
   assertIteratorResult('a', false, iterator.next());
   assertIteratorResult('b', false, iterator.next());
   assertIteratorResult('c', false, iterator.next());
   array.push('d');
   assertIteratorResult('d', false, iterator.next());
   assertIteratorResult(void 0, true, iterator.next());
 }
-TestValuesMutate();
+// TODO(arv): Reenable once @@unscopables are shipping.
+// TestValuesMutate();
 
 
 function TestKeys() {
   var array = ['a', 'b', 'c'];
   var iterator = array.keys();
   assertIteratorResult(0, false, iterator.next());
   assertIteratorResult(1, false, iterator.next());
   assertIteratorResult(2, false, iterator.next());
   assertIteratorResult(void 0, true, iterator.next());
 
@@ skipping 38 matching lines @@
   assertIteratorResult([2, 'c'], false, iterator.next());
   array.push('d');
   assertIteratorResult([3, 'd'], false, iterator.next());
   assertIteratorResult(void 0, true, iterator.next());
 }
 TestEntriesMutate();
 
 
 function TestArrayIteratorPrototype() {
   var array = [];
-  var iterator = array.values();
+  var iterator = array.entries();
 
   var ArrayIteratorPrototype = iterator.__proto__;
 
-  assertEquals(ArrayIteratorPrototype, array.values().__proto__);
+  // TODO(arv): Reenable once @@unscopables are shipping.
+  // assertEquals(ArrayIteratorPrototype, array.values().__proto__);
   assertEquals(ArrayIteratorPrototype, array.keys().__proto__);
   assertEquals(ArrayIteratorPrototype, array.entries().__proto__);
 
   assertEquals(Object.prototype, ArrayIteratorPrototype.__proto__);
 
-  assertEquals('Array Iterator', %_ClassOf(array.values()));
+  // TODO(arv): Reenable once @@unscopables are shipping.
+  // assertEquals('Array Iterator', %_ClassOf(array.values()));
   assertEquals('Array Iterator', %_ClassOf(array.keys()));
   assertEquals('Array Iterator', %_ClassOf(array.entries()));
 
   assertFalse(ArrayIteratorPrototype.hasOwnProperty('constructor'));
   assertArrayEquals(['next'],
       Object.getOwnPropertyNames(ArrayIteratorPrototype));
   assertHasOwnProperty(ArrayIteratorPrototype, 'next', DONT_ENUM);
   assertHasOwnProperty(ArrayIteratorPrototype, Symbol.iterator, DONT_ENUM);
 }
 TestArrayIteratorPrototype();
 
 
 function TestForArrayValues() {
   var buffer = [];
   var array = [0, 'a', true, false, null, /* hole */, undefined, NaN];
   var i = 0;
   for (var value of array.values()) {
     buffer[i++] = value;
   }
 
   assertEquals(8, buffer.length);
 
   for (var i = 0; i < buffer.length - 1; i++) {
     assertSame(array[i], buffer[i]);
   }
   assertTrue(isNaN(buffer[buffer.length - 1]));
 }
-TestForArrayValues();
+// TODO(arv): Reenable once @@unscopables are shipping.
+// TestForArrayValues();
 
 
 function TestForArrayKeys() {
   var buffer = [];
   var array = [0, 'a', true, false, null, /* hole */, undefined, NaN];
   var i = 0;
   for (var key of array.keys()) {
     buffer[i++] = key;
   }
 
@@ skipping 36 matching lines @@
     buffer[i++] = value;
   }
 
   assertEquals(8, buffer.length);
 
   for (var i = 0; i < buffer.length - 1; i++) {
     assertSame(array[i], buffer[i]);
   }
   assertTrue(isNaN(buffer[buffer.length - 1]));
 }
-TestForArrayValues();
+TestForArray();
 
 
 function TestNonOwnSlots() {
   var array = [0];
-  var iterator = array.values();
+  var iterator = array.entries();
   var object = {__proto__: iterator};
 
   assertThrows(function() {
     object.next();
   }, TypeError);
 }
 TestNonOwnSlots();