Array#fetch now gives precedence to default block over default argument

This is rubyspec compliant, and fixes 1 filtered spec
opal · Sep 20, 2013 · e80a425 · e80a425
1 parent b5f907c
commit e80a425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/corelib/array.rb b/corelib/array.rb
@@ -527,14 +527,14 @@ def fetch(index, defaults = undefined, &block)
         return #{self}[index];
       }
 
-      if (defaults != null) {
-        return defaults;
-      }
-
       if (block !== nil) {
         return block(original);
       }
 
+      if (defaults != null) {
+        return defaults;
+      }
+
       #{ raise IndexError, "Array#fetch" };
     }
   end

diff --git a/spec/filters/bugs/array/fetch.rb b/spec/filters/bugs/array/fetch.rb