1 files changed, 20 insertions, 6 deletions
diff --git a/spec/ruby/core/regexp/initialize_spec.rb b/spec/ruby/core/regexp/initialize_spec.rb
index 3c32f97a31..1c0133acae 100644
--- a/spec/ruby/core/regexp/initialize_spec.rb
+++ b/spec/ruby/core/regexp/initialize_spec.rb
@@ -1,15 +1,29 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Regexp#initialize" do
   it "is a private method" do
-    Regexp.should have_private_method(:initialize)
+    Regexp.private_instance_methods(false).should.include?(:initialize)
   end
 
-  it "raises a SecurityError on a Regexp literal" do
-    lambda { //.send(:initialize, "") }.should raise_error(SecurityError)
+  it "raises a FrozenError on a Regexp literal" do
+    -> { //.send(:initialize, "") }.should.raise(FrozenError)
   end
 
-  it "raises a TypeError on an initialized non-literal Regexp" do
-    lambda { Regexp.new("").send(:initialize, "") }.should raise_error(TypeError)
+  ruby_version_is "4.1" do
+    it "raises a FrozenError on an initialized non-literal Regexp" do
+      regexp = Regexp.new("")
+      -> { regexp.send(:initialize, "") }.should.raise(FrozenError)
+    end
+  end
+
+  ruby_version_is ""..."4.1" do
+    it "raises a TypeError on an initialized non-literal Regexp" do
+      -> { Regexp.new("").send(:initialize, "") }.should.raise(TypeError)
+    end
+  end
+
+  it "raises a TypeError on an initialized non-literal Regexp subclass" do
+    r = Class.new(Regexp).new("")
+    -> { r.send(:initialize, "") }.should.raise(TypeError)
   end
 end