1 files changed, 8 insertions, 19 deletions
diff --git a/spec/ruby/core/regexp/new_spec.rb b/spec/ruby/core/regexp/new_spec.rb
index c9581e661f..79210e9a23 100644
--- a/spec/ruby/core/regexp/new_spec.rb
+++ b/spec/ruby/core/regexp/new_spec.rb
@@ -1,30 +1,19 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../shared/new_ascii', __FILE__)
-require File.expand_path('../shared/new_ascii_8bit', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'shared/new'
 
 describe "Regexp.new" do
-  it_behaves_like :regexp_new_ascii, :new
-  it_behaves_like :regexp_new_ascii_8bit, :new
+  it_behaves_like :regexp_new, :new
 end
 
 describe "Regexp.new given a String" do
-  it_behaves_like :regexp_new_string_ascii, :new
-  it_behaves_like :regexp_new_string_ascii_8bit, :new
+  it_behaves_like :regexp_new_string, :new
+  it_behaves_like :regexp_new_string_binary, :new
 end
 
 describe "Regexp.new given a Regexp" do
-  it_behaves_like :regexp_new_regexp_ascii, :new
-  it_behaves_like :regexp_new_regexp_ascii_8bit, :new
+  it_behaves_like :regexp_new_regexp, :new
 end
 
-describe "Regexp.new given a Fixnum" do
-  it "raises a TypeError" do
-    lambda { Regexp.new(1) }.should raise_error(TypeError)
-  end
-end
-
-describe "Regexp.new given a Float" do
-  it "raises a TypeError" do
-    lambda { Regexp.new(1.0) }.should raise_error(TypeError)
-  end
+describe "Regexp.new given a non-String/Regexp" do
+  it_behaves_like :regexp_new_non_string_or_regexp, :new
 end