2 files changed, 38 insertions, 3 deletions
diff --git a/spec/ruby/core/struct/shared/inspect.rb b/spec/ruby/core/struct/shared/inspect.rb
index 90594a5452..1a0fb6a6b2 100644
--- a/spec/ruby/core/struct/shared/inspect.rb
+++ b/spec/ruby/core/struct/shared/inspect.rb
@@ -1,5 +1,40 @@
 describe :struct_inspect, shared: true do
+  it "returns a string representation showing members and values" do
+    car = StructClasses::Car.new('Ford', 'Ranger')
+    car.send(@method).should == '#<struct StructClasses::Car make="Ford", model="Ranger", year=nil>'
+  end
+
   it "returns a string representation without the class name for anonymous structs" do
     Struct.new(:a).new("").send(@method).should == '#<struct a="">'
   end
+
+  it "returns a string representation without the class name for structs nested in anonymous classes" do
+    c = Class.new
+    c.class_eval <<~DOC
+      class Foo < Struct.new(:a); end
+    DOC
+
+    c::Foo.new("").send(@method).should == '#<struct a="">'
+  end
+
+  it "returns a string representation without the class name for structs nested in anonymous modules" do
+    m = Module.new
+    m.module_eval <<~DOC
+      class Foo < Struct.new(:a); end
+    DOC
+
+    m::Foo.new("").send(@method).should == '#<struct a="">'
+  end
+
+  it "does not call #name method" do
+    struct = StructClasses::StructWithOverriddenName.new("")
+    struct.send(@method).should == '#<struct StructClasses::StructWithOverriddenName a="">'
+  end
+
+  it "does not call #name method when struct is anonymous" do
+    struct = Struct.new(:a)
+    def struct.name; "A"; end
+
+    struct.new("").send(@method).should == '#<struct a="">'
+  end
 end
diff --git a/spec/ruby/core/struct/shared/select.rb b/spec/ruby/core/struct/shared/select.rb
index 35abee461b..dfa1a809fe 100644
--- a/spec/ruby/core/struct/shared/select.rb
+++ b/spec/ruby/core/struct/shared/select.rb
@@ -4,7 +4,7 @@ require_relative '../fixtures/classes'
 describe :struct_select, shared: true do
   it "raises an ArgumentError if given any non-block arguments" do
     struct = StructClasses::Car.new
-    -> { struct.send(@method, 1) { } }.should raise_error(ArgumentError)
+    -> { struct.send(@method, 1) { } }.should.raise(ArgumentError)
   end
 
   it "returns a new array of elements for which block is true" do
@@ -14,13 +14,13 @@ describe :struct_select, shared: true do
 
   it "returns an instance of Array" do
     struct = StructClasses::Car.new("Ford", "Escort", "1995")
-    struct.send(@method) { true }.should be_an_instance_of(Array)
+    struct.send(@method) { true }.should.instance_of?(Array)
   end
 
   describe "without block" do
     it "returns an instance of Enumerator" do
       struct = Struct.new(:foo).new
-      struct.send(@method).should be_an_instance_of(Enumerator)
+      struct.send(@method).should.instance_of?(Enumerator)
     end
   end
 end