1 files changed, 20 insertions, 4 deletions
diff --git a/spec/ruby/library/openstruct/to_s_spec.rb b/spec/ruby/library/openstruct/to_s_spec.rb
index 8efa3f5aaf..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 File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'ostruct'
-require File.expand_path('../fixtures/classes', __FILE__)
-require File.expand_path('../shared/inspect', __FILE__)
+require_relative 'fixtures/classes'
 
 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