diff --git a/lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb b/lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb index d5c4e6e..1d257f1 100644 --- a/lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb +++ b/lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb @@ -123,9 +123,14 @@ module Spec restriction = [restriction] unless restriction.is_a?(Array) restriction.map! {|r| @validator.class.send(:type_cast_value, r, @type) } interpolate = @validator.send(:interpolation_values, option, restriction ) + # get I18n message if defined and has interpolation keys in msg if defined?(I18n) && !@validator.send(:custom_error_messages).include?(option) - msg = @record.errors.generate_message(@expected, option, interpolate) + msg = if defined?(ActiveRecord::Error) + ActiveRecord::Error.new(@record, @expected, option, interpolate).message + else + @record.errors.generate_message(@expected, option, interpolate) + end else msg = msg % interpolate end diff --git a/spec/ginger_scenarios.rb b/spec/ginger_scenarios.rb index edc541e..dfe8720 100644 --- a/spec/ginger_scenarios.rb +++ b/spec/ginger_scenarios.rb @@ -9,7 +9,7 @@ # ginger spec # Ginger.configure do |config| - rails_versions = ['2.0.2', '2.1.2', '2.2.2', '2.3.2'] + rails_versions = ['2.0.2', '2.1.2', '2.2.2', '2.3.3', '2.3.4'] rails_versions.each do |v| g = Ginger::Scenario.new("Rails #{v}")