Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cdf882cf1a1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63821af4c85b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2018

  1. Remove TestArray#test_zip exclusion test case

    @nomadium
    nomadium committed Jan 25, 2018
    Copy the full SHA
    b8637fe View commit details

Commits on Jan 29, 2018

  1. Merge pull request #5011 from nomadium/fix-array-test-zip-exclude 

    Remove TestArray#test_zip exclusion test case
    @enebo
    enebo authored Jan 29, 2018
    Copy the full SHA
    63821af View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −0 core/src/main/java/org/jruby/RubyArray.java
  2. +0 −1 test/mri/excludes/TestArray.rb
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -2823,6 +2823,7 @@ public IRubyObject zip(ThreadContext context, IRubyObject[] args, Block block) {
RubySymbol each = runtime.newSymbol("each");
for (int i = 0; i < args.length; i++) {
IRubyObject arg = args[i];
if (!arg.respondsTo("each")) throw runtime.newTypeError(arg, "must respond to :each");
newArgs[i] = to_enum.call(context, arg, arg, each);
}
}
1 change: 0 additions & 1 deletion test/mri/excludes/TestArray.rb
View file
Original file line number Diff line number Diff line change
@@ -17,4 +17,3 @@
exclude :test_to_h, ""
exclude :test_uniq_bang_with_freeze, ""
exclude :test_values_at2, ""
exclude :test_zip, ""