Update to ruby/spec@4eec3dc

2 files changed, 23 insertions, 0 deletions

diff --git a/spec/ruby/language/match_spec.rb b/spec/ruby/language/match_spec.rb
index 36d347bd57..ebf677cabc 100644
--- a/spec/ruby/language/match_spec.rb
+++ b/spec/ruby/language/match_spec.rb
@@ -48,6 +48,13 @@ describe "The =~ operator with named captures" do
     end
   end
 
+  describe "on syntax of 'string_literal' =~ /regexp/" do
+    it "does not set local variables" do
+      'string literal' =~ /(?<matched>str)(?<unmatched>lit)?/
+      local_variables.should == []
+    end
+  end
+
   describe "on syntax of string_variable =~ /regexp/" do
     it "does not set local variables" do
       @string =~ /(?<matched>foo)(?<unmatched>bar)?/
diff --git a/spec/ruby/language/regexp/encoding_spec.rb b/spec/ruby/language/regexp/encoding_spec.rb
index dce64a4753..b8559c6b27 100644
--- a/spec/ruby/language/regexp/encoding_spec.rb
+++ b/spec/ruby/language/regexp/encoding_spec.rb
@@ -42,6 +42,10 @@ describe "Regexps with encoding modifiers" do
     /./n.encoding.should == Encoding::US_ASCII
   end
 
+  it 'uses BINARY when is not initialized' do
+    Regexp.allocate.encoding.should == Encoding::BINARY
+  end
+
   it 'uses BINARY as /n encoding if not all chars are 7-bit' do
     /\xFF/n.encoding.should == Encoding::BINARY
   end
@@ -100,4 +104,16 @@ describe "Regexps with encoding modifiers" do
   it "selects last of multiple encoding specifiers" do
     /foo/ensuensuens.should == /foo/s
   end
+
+  it "raises Encoding::CompatibilityError when trying match against different encodings" do
+    -> { /\A[[:space:]]*\z/.match(" ".encode("UTF-16LE")) }.should raise_error(Encoding::CompatibilityError)
+  end
+
+  it "raises Encoding::CompatibilityError when trying match? against different encodings" do
+    -> { /\A[[:space:]]*\z/.match?(" ".encode("UTF-16LE")) }.should raise_error(Encoding::CompatibilityError)
+  end
+
+  it "raises Encoding::CompatibilityError when trying =~ against different encodings" do
+    -> { /\A[[:space:]]*\z/ =~ " ".encode("UTF-16LE") }.should raise_error(Encoding::CompatibilityError)
+  end
 end