1 files changed, 36 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Array/from/mapfn-is-not-callable-typeerror.js b/js/src/tests/test262/built-ins/Array/from/mapfn-is-not-callable-typeerror.js
new file mode 100644
index 0000000000..663355bf7e
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Array/from/mapfn-is-not-callable-typeerror.js
@@ -0,0 +1,36 @@
+// Copyright 2015 Leonardo Balter. All rights reserved.
+// This code is governed by the license found in the LICENSE file.
+/*---
+esid: sec-array.from
+description: Throws a TypeError if mapFn is not callable
+info: |
+  22.1.2.1 Array.from ( items [ , mapfn [ , thisArg ] ] )
+
+  ...
+  2. If mapfn is undefined, let mapping be false.
+  3. else
+    a. If IsCallable(mapfn) is false, throw a TypeError exception.
+    ...
+---*/
+
+assert.throws(TypeError, function() {
+  Array.from([], null);
+}, 'Array.from([], null) throws a TypeError exception');
+
+assert.throws(TypeError, function() {
+  Array.from([], {});
+}, 'Array.from([], {}) throws a TypeError exception');
+
+assert.throws(TypeError, function() {
+  Array.from([], 'string');
+}, 'Array.from([], "string") throws a TypeError exception');
+
+assert.throws(TypeError, function() {
+  Array.from([], true);
+}, 'Array.from([], true) throws a TypeError exception');
+
+assert.throws(TypeError, function() {
+  Array.from([], 42);
+}, 'Array.from([], 42) throws a TypeError exception');
+
+reportCompare(0, 0);