4 files changed, 22 insertions, 26 deletions
diff --git a/spec/ruby/library/openstruct/equal_value_spec.rb b/spec/ruby/library/openstruct/equal_value_spec.rb
index c72c09ce14..ec30214fd3 100644
--- a/spec/ruby/library/openstruct/equal_value_spec.rb
+++ b/spec/ruby/library/openstruct/equal_value_spec.rb
@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require "ostruct"
+require 'ostruct'
 require_relative 'fixtures/classes'
 
 describe "OpenStruct#==" do
diff --git a/spec/ruby/library/openstruct/inspect_spec.rb b/spec/ruby/library/openstruct/inspect_spec.rb
index e2fed41528..81da96d6bf 100644
--- a/spec/ruby/library/openstruct/inspect_spec.rb
+++ b/spec/ruby/library/openstruct/inspect_spec.rb
@@ -1,8 +1,8 @@
 require_relative '../../spec_helper'
 require 'ostruct'
-require_relative 'fixtures/classes'
-require_relative 'shared/inspect'
 
 describe "OpenStruct#inspect" do
-  it_behaves_like :ostruct_inspect, :inspect
+  it "is an alias of OpenStruct#to_s" do
+    OpenStruct.instance_method(:inspect).should == OpenStruct.instance_method(:to_s)
+  end
 end
diff --git a/spec/ruby/library/openstruct/shared/inspect.rb b/spec/ruby/library/openstruct/shared/inspect.rb
deleted file mode 100644
index d5fffa0e2e..0000000000
--- a/spec/ruby/library/openstruct/shared/inspect.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-describe :ostruct_inspect, shared: true do
-  it "returns a String representation of self" do
-    os = OpenStruct.new(name: "John Smith")
-    os.send(@method).should == "#<OpenStruct name=\"John Smith\">"
-
-    os = OpenStruct.new(age: 20, name: "John Smith")
-    os.send(@method).should.is_a?(String)
-  end
-
-  it "correctly handles self-referential OpenStructs" do
-    os = OpenStruct.new
-    os.self = os
-    os.send(@method).should == "#<OpenStruct self=#<OpenStruct ...>>"
-  end
-
-  it "correctly handles OpenStruct subclasses" do
-    os = OpenStructSpecs::OpenStructSub.new(name: "John Smith")
-    os.send(@method).should == "#<OpenStructSpecs::OpenStructSub name=\"John Smith\">"
-  end
-end
diff --git a/spec/ruby/library/openstruct/to_s_spec.rb b/spec/ruby/library/openstruct/to_s_spec.rb
index 73d91bf981..9131cd4897 100644
--- a/spec/ruby/library/openstruct/to_s_spec.rb
+++ b/spec/ruby/library/openstruct/to_s_spec.rb
@@ -1,8 +1,24 @@
 require_relative '../../spec_helper'
 require 'ostruct'
 require_relative 'fixtures/classes'
-require_relative 'shared/inspect'
 
 describe "OpenStruct#to_s" do
-  it_behaves_like :ostruct_inspect, :to_s
+  it "returns a String representation of self" do
+    os = OpenStruct.new(name: "John Smith")
+    os.to_s.should == "#<OpenStruct name=\"John Smith\">"
+
+    os = OpenStruct.new(age: 20, name: "John Smith")
+    os.to_s.should.is_a?(String)
+  end
+
+  it "correctly handles self-referential OpenStructs" do
+    os = OpenStruct.new
+    os.self = os
+    os.to_s.should == "#<OpenStruct self=#<OpenStruct ...>>"
+  end
+
+  it "correctly handles OpenStruct subclasses" do
+    os = OpenStructSpecs::OpenStructSub.new(name: "John Smith")
+    os.to_s.should == "#<OpenStructSpecs::OpenStructSub name=\"John Smith\">"
+  end
 end