1 files changed, 20 insertions, 6 deletions
diff --git a/spec/ruby/core/string/include_spec.rb b/spec/ruby/core/string/include_spec.rb
index d7780de602..9781140a55 100644
--- a/spec/ruby/core/string/include_spec.rb
+++ b/spec/ruby/core/string/include_spec.rb
@@ -1,5 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes.rb', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "String#include? with String" do
   it "returns true if self contains other_str" do
@@ -13,6 +13,20 @@ describe "String#include? with String" do
     StringSpecs::MyString.new("hello").include?(StringSpecs::MyString.new("lo")).should == true
   end
 
+  it "returns true if both strings are empty" do
+    "".should.include?("")
+    "".dup.force_encoding("EUC-JP").should.include?("")
+    "".should.include?("".dup.force_encoding("EUC-JP"))
+    "".dup.force_encoding("EUC-JP").should.include?("".dup.force_encoding("EUC-JP"))
+  end
+
+  it "returns true if the RHS is empty" do
+    "a".should.include?("")
+    "a".dup.force_encoding("EUC-JP").should.include?("")
+    "a".should.include?("".dup.force_encoding("EUC-JP"))
+    "a".dup.force_encoding("EUC-JP").should.include?("".dup.force_encoding("EUC-JP"))
+  end
+
   it "tries to convert other to string using to_str" do
     other = mock('lo')
     other.should_receive(:to_str).and_return("lo")
@@ -21,14 +35,14 @@ describe "String#include? with String" do
   end
 
   it "raises a TypeError if other can't be converted to string" do
-    lambda { "hello".include?([])       }.should raise_error(TypeError)
-    lambda { "hello".include?('h'.ord)  }.should raise_error(TypeError)
-    lambda { "hello".include?(mock('x')) }.should raise_error(TypeError)
+    -> { "hello".include?([])       }.should raise_error(TypeError)
+    -> { "hello".include?('h'.ord)  }.should raise_error(TypeError)
+    -> { "hello".include?(mock('x')) }.should raise_error(TypeError)
   end
 
   it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
     pat = "ア".encode Encoding::EUC_JP
-    lambda do
+    -> do
       "あれ".include?(pat)
     end.should raise_error(Encoding::CompatibilityError)
   end