1 files changed, 15 insertions, 6 deletions
diff --git a/spec/ruby/core/module/attr_reader_spec.rb b/spec/ruby/core/module/attr_reader_spec.rb
index 238e3db9ea..2b4ca2100e 100644
--- a/spec/ruby/core/module/attr_reader_spec.rb
+++ b/spec/ruby/core/module/attr_reader_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/attr_added'
 
 describe "Module#attr_reader" do
   it "creates a getter for each given attribute name" do
@@ -29,10 +30,10 @@ describe "Module#attr_reader" do
       attr_reader :spec_attr_reader
     end
 
-    -> { true.instance_variable_set("@spec_attr_reader", "a") }.should raise_error(RuntimeError)
+    -> { true.instance_variable_set("@spec_attr_reader", "a") }.should.raise(RuntimeError)
   end
 
-  it "converts non string/symbol/fixnum names to strings using to_str" do
+  it "converts non string/symbol names to strings using to_str" do
     (o = mock('test')).should_receive(:to_str).any_number_of_times.and_return("test")
     c = Class.new do
       attr_reader o
@@ -44,9 +45,9 @@ describe "Module#attr_reader" do
 
   it "raises a TypeError when the given names can't be converted to strings using to_str" do
     o = mock('o')
-    -> { Class.new { attr_reader o } }.should raise_error(TypeError)
+    -> { Class.new { attr_reader o } }.should.raise(TypeError)
     (o = mock('123')).should_receive(:to_str).and_return(123)
-    -> { Class.new { attr_reader o } }.should raise_error(TypeError)
+    -> { Class.new { attr_reader o } }.should.raise(TypeError)
   end
 
   it "applies current visibility to methods created" do
@@ -55,10 +56,18 @@ describe "Module#attr_reader" do
       attr_reader :foo
     end
 
-    -> { c.new.foo }.should raise_error(NoMethodError)
+    -> { c.new.foo }.should.raise(NoMethodError)
   end
 
   it "is a public method" do
-    Module.should have_public_instance_method(:attr_reader, false)
+    Module.public_instance_methods(false).should.include?(:attr_reader)
   end
+
+  it "returns an array of defined method names as symbols" do
+    Class.new do
+      (attr_reader :foo, 'bar').should == [:foo, :bar]
+    end
+  end
+
+  it_behaves_like :module_attr_added, :attr_reader
 end