Fix Array.try_convert compliance

opal · Nov 27, 2013 · b05aa05 · b05aa05
1 parent 423241a
commit b05aa05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/opal/corelib/array.rb b/opal/corelib/array.rb
@@ -75,10 +75,8 @@ def self.new(size = nil, obj = nil, &block)
   end
 
   def self.try_convert(obj)
-    return obj if Array === obj
-    return obj.to_ary if obj.respond_to? :to_ary
-
-    nil
+    return nil unless obj.respond_to? :to_ary
+    obj = Opal.coerce_to obj, Array, :to_ary
   end
 
   def &(other)

diff --git a/spec/opal/filters/bugs/array.rb b/spec/opal/filters/bugs/array.rb
@@ -132,11 +132,7 @@
   fails "Array#transpose raises a TypeError if the passed Argument does not respond to #to_ary"
   fails "Array#transpose tries to convert the passed argument to an Array using #to_ary"
 
-  fails "Array.try_convert does not rescue exceptions raised by #to_ary"
   fails "Array.try_convert sends #to_ary to the argument and raises TypeError if it's not a kind of Array"
-  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's a kind of Array"
-  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's an Array"
-  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's nil"
 
   fails "Array#uniq compares elements based on the value returned from the block"
   fails "Array#uniq compares elements with matching hash codes with #eql?"