1 files changed, 43 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Array/from/iter-map-fn-err.js b/js/src/tests/test262/built-ins/Array/from/iter-map-fn-err.js
new file mode 100644
index 0000000000..beeca8e4eb
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Array/from/iter-map-fn-err.js
@@ -0,0 +1,43 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-array.from
+description: Error invoking map function (traversed via iterator)
+info: |
+    [...]
+    6. If usingIterator is not undefined, then
+       [...]
+       g. Repeat
+          [...]
+          vii. If mapping is true, then
+               1. Let mappedValue be Call(mapfn, T, «nextValue, k»).
+               2. If mappedValue is an abrupt completion, return
+                  IteratorClose(iterator, mappedValue).
+features: [Symbol.iterator]
+---*/
+
+var closeCount = 0;
+var mapFn = function() {
+  throw new Test262Error();
+};
+var items = {};
+items[Symbol.iterator] = function() {
+  return {
+    return: function() {
+      closeCount += 1;
+    },
+    next: function() {
+      return {
+        done: false
+      };
+    }
+  };
+};
+
+assert.throws(Test262Error, function() {
+  Array.from(items, mapFn);
+}, 'Array.from(items, mapFn) throws a Test262Error exception');
+
+assert.sameValue(closeCount, 1, 'The value of closeCount is expected to be 1');
+
+reportCompare(0, 0);