1 files changed, 19 insertions, 6 deletions
diff --git a/spec/ruby/core/enumerable/grep_spec.rb b/spec/ruby/core/enumerable/grep_spec.rb
index c9c0f34e27..965e183766 100644
--- a/spec/ruby/core/enumerable/grep_spec.rb
+++ b/spec/ruby/core/enumerable/grep_spec.rb
@@ -40,15 +40,28 @@ describe "Enumerable#grep" do
     $~.should == nil
   end
 
-  it "sets $~ to the last match when given no block" do
+  it "does not set $~ when given no block" do
     "z" =~ /z/ # Reset $~
     ["abc", "def"].grep(/b/).should == ["abc"]
+    $&.should == "z"
+  end
 
-    # Set by the failed match of "def"
-    $~.should == nil
+  it "does not modify Regexp.last_match without block" do
+    "z" =~ /z/ # Reset last match
+    ["abc", "def"].grep(/b/).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(/[a-d]/).should == [:a, 'b', :c]
+    $1.should == 'match'
 
-    ["abc", "def"].grep(/e/)
-    $&.should == "e"
+    o = Object.new
+    def o.to_str
+      'hello'
+    end
+    [o].grep(/ll/).first.should.equal?(o)
   end
 
   describe "with a block" do
@@ -68,7 +81,7 @@ describe "Enumerable#grep" do
     end
 
     it "raises an ArgumentError when not given a pattern" do
-      -> { @numerous.grep { |e| e } }.should raise_error(ArgumentError)
+      -> { @numerous.grep { |e| e } }.should.raise(ArgumentError)
     end
   end
 end