1 files changed, 73 insertions, 40 deletions
diff --git a/spec/ruby/core/enumerable/grep_v_spec.rb b/spec/ruby/core/enumerable/grep_v_spec.rb
index 05c43a43ef..ee99a77ac1 100644
--- a/spec/ruby/core/enumerable/grep_v_spec.rb
+++ b/spec/ruby/core/enumerable/grep_v_spec.rb
@@ -1,43 +1,76 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
-ruby_version_is "2.3" do
-  describe "Enumerable#grep_v" do
-    before :each do
-      @numerous = EnumerableSpecs::Numerous.new(*(0..9).to_a)
-      def (@odd_matcher = BasicObject.new).===(obj)
-        obj.odd?
-      end
-    end
-
-    describe "without block" do
-      it "returns an Array of matched elements" do
-        @numerous.grep_v(@odd_matcher).should == [0, 2, 4, 6, 8]
-      end
-
-      it "compares pattern with gathered array when yielded with multiple arguments" do
-        (unmatcher = Object.new).stub!(:===).and_return(false)
-        EnumerableSpecs::YieldsMixed2.new.grep_v(unmatcher).should == EnumerableSpecs::YieldsMixed2.gathered_yields
-      end
-
-      it "raises an ArgumentError when not given a pattern" do
-        -> { @numerous.grep_v }.should raise_error(ArgumentError)
-      end
-    end
-
-    describe "with block" do
-      it "returns an Array of matched elements that mapped by the block" do
-        @numerous.grep_v(@odd_matcher) { |n| n * 2 }.should == [0, 4, 8, 12, 16]
-      end
-
-      it "calls the block with gathered array when yielded with multiple arguments" do
-        (unmatcher = Object.new).stub!(:===).and_return(false)
-        EnumerableSpecs::YieldsMixed2.new.grep_v(unmatcher){ |e| e }.should == EnumerableSpecs::YieldsMixed2.gathered_yields
-      end
-
-      it "raises an ArgumentError when not given a pattern" do
-        -> { @numerous.grep_v { |e| e } }.should raise_error(ArgumentError)
-      end
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Enumerable#grep_v" do
+  before :each do
+    @numerous = EnumerableSpecs::Numerous.new(*(0..9).to_a)
+    def (@odd_matcher = BasicObject.new).===(obj)
+      obj.odd?
+    end
+  end
+
+  it "sets $~ in the block" do
+    "z" =~ /z/ # Reset $~
+    ["abc", "def"].grep_v(/e/) { |e|
+      e.should == "abc"
+      $~.should == nil
+    }
+
+    # Set by the match of "def"
+    $&.should == "e"
+  end
+
+  it "does not set $~ when given no block" do
+    "z" =~ /z/ # Reset $~
+    ["abc", "def"].grep_v(/e/).should == ["abc"]
+    $&.should == "z"
+  end
+
+  it "does not modify Regexp.last_match without block" do
+    "z" =~ /z/ # Reset last match
+    ["abc", "def"].grep_v(/e/).should == ["abc"]
+    Regexp.last_match[0].should == "z"
+  end
+
+  it "correctly handles non-string elements" do
+    'set last match' =~ /set last (.*)/
+    [:a, 'b', 'z', :c, 42, nil].grep_v(/[a-d]/).should == ['z', 42, nil]
+    $1.should == 'match'
+
+    o = Object.new
+    def o.to_str
+      'hello'
+    end
+    [o].grep_v(/mm/).first.should.equal?(o)
+  end
+
+  describe "without block" do
+    it "returns an Array of matched elements" do
+      @numerous.grep_v(@odd_matcher).should == [0, 2, 4, 6, 8]
+    end
+
+    it "compares pattern with gathered array when yielded with multiple arguments" do
+      (unmatcher = Object.new).stub!(:===).and_return(false)
+      EnumerableSpecs::YieldsMixed2.new.grep_v(unmatcher).should == EnumerableSpecs::YieldsMixed2.gathered_yields
+    end
+
+    it "raises an ArgumentError when not given a pattern" do
+      -> { @numerous.grep_v }.should.raise(ArgumentError)
+    end
+  end
+
+  describe "with block" do
+    it "returns an Array of matched elements that mapped by the block" do
+      @numerous.grep_v(@odd_matcher) { |n| n * 2 }.should == [0, 4, 8, 12, 16]
+    end
+
+    it "calls the block with gathered array when yielded with multiple arguments" do
+      (unmatcher = Object.new).stub!(:===).and_return(false)
+      EnumerableSpecs::YieldsMixed2.new.grep_v(unmatcher){ |e| e }.should == EnumerableSpecs::YieldsMixed2.gathered_yields
+    end
+
+    it "raises an ArgumentError when not given a pattern" do
+      -> { @numerous.grep_v { |e| e } }.should.raise(ArgumentError)
     end
   end
 end