From 316086e76f97c9512070b0b4497f36ae1a0975db Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Thu, 14 Oct 2010 07:55:35 +1100 Subject: [PATCH] ruby 1.9.2 spec fixes for instance method checks --- spec/validates_timeliness/attribute_methods_spec.rb | 4 ++-- spec/validates_timeliness/helper_methods_spec.rb | 6 +++--- spec/validates_timeliness/orm/active_record_spec.rb | 8 ++++---- spec/validates_timeliness/orm/mongoid_spec.rb | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/validates_timeliness/attribute_methods_spec.rb b/spec/validates_timeliness/attribute_methods_spec.rb index cd1f618..27007f6 100644 --- a/spec/validates_timeliness/attribute_methods_spec.rb +++ b/spec/validates_timeliness/attribute_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe ValidatesTimeliness::AttributeMethods do it 'should define _timeliness_raw_value_for instance method' do - PersonWithShim.instance_methods.should include('_timeliness_raw_value_for') + PersonWithShim.new.should respond_to(:_timeliness_raw_value_for) end describe ".timeliness_validated_attributes" do @@ -70,7 +70,7 @@ describe ValidatesTimeliness::AttributeMethods do context "before_type_cast method" do it 'should not be defined if ORM does not support it' do - PersonWithShim.instance_methods(false).should_not include("birth_datetime_before_type_cast") + PersonWithShim.new.should_not respond_to(:birth_datetime_before_type_cast) end end end diff --git a/spec/validates_timeliness/helper_methods_spec.rb b/spec/validates_timeliness/helper_methods_spec.rb index 29b2ff8..0b05b4f 100644 --- a/spec/validates_timeliness/helper_methods_spec.rb +++ b/spec/validates_timeliness/helper_methods_spec.rb @@ -8,9 +8,9 @@ describe ValidatesTimeliness, 'HelperMethods' do end it 'should define instance validation methods' do - Person.instance_methods.should include('validates_date') - Person.instance_methods.should include('validates_time') - Person.instance_methods.should include('validates_datetime') + Person.new.should respond_to(:validates_date) + Person.new.should respond_to(:validates_time) + Person.new.should respond_to(:validates_datetime) end it 'should validate instance when validation method called' do diff --git a/spec/validates_timeliness/orm/active_record_spec.rb b/spec/validates_timeliness/orm/active_record_spec.rb index 8d7485a..ece5658 100644 --- a/spec/validates_timeliness/orm/active_record_spec.rb +++ b/spec/validates_timeliness/orm/active_record_spec.rb @@ -10,9 +10,9 @@ describe ValidatesTimeliness, 'ActiveRecord' do end it 'should defines for the instance' do - ActiveRecord::Base.instance_methods.should include('validates_date') - ActiveRecord::Base.instance_methods.should include('validates_time') - ActiveRecord::Base.instance_methods.should include('validates_datetime') + Employee.new.should respond_to(:validates_date) + Employee.new.should respond_to(:validates_time) + Employee.new.should respond_to(:validates_datetime) end end @@ -73,7 +73,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do context "before_type_cast method" do it 'should be defined on class if ORM supports it' do - Employee.instance_methods(false).should include("birth_datetime_before_type_cast") + Employee.new.should respond_to(:birth_datetime_before_type_cast) end it 'should return original value' do diff --git a/spec/validates_timeliness/orm/mongoid_spec.rb b/spec/validates_timeliness/orm/mongoid_spec.rb index f1cfa5e..d0a023f 100644 --- a/spec/validates_timeliness/orm/mongoid_spec.rb +++ b/spec/validates_timeliness/orm/mongoid_spec.rb @@ -34,9 +34,9 @@ describe ValidatesTimeliness, 'Mongoid' do end it 'should be defined on the instance' do - Article.instance_methods.should include('validates_date') - Article.instance_methods.should include('validates_time') - Article.instance_methods.should include('validates_datetime') + Article.new.should respond_to(:validates_date) + Article.new.should respond_to(:validates_time) + Article.new.should respond_to(:validates_datetime) end end @@ -85,7 +85,7 @@ describe ValidatesTimeliness, 'Mongoid' do context "before_type_cast method" do it 'should not be defined if ORM does not support it' do - Article.instance_methods(false).should_not include("birth_datetime_before_type_cast") + Article.new.should_not respond_to(:birth_datetime_before_type_cast) end end end