.gitignore test/fixtures/en.yml @@ -114,7 +114,7 @@ module ValidatesDateTime if options[:before] options[:before].each do |r| if r.value(record) and value >= r.last_value - record.errors.add(attr_name, :before, :default => options[:before_message] % r) + record.errors.add(attr_name, :before, :value => r, :default => options[:before_message] % r) break end end @@ -123,7 +123,7 @@ module ValidatesDateTime if options[:after] options[:after].each do |r| if r.value(record) and value <= r.last_value - record.errors.add(attr_name, :after, :default => options[:after_message] % r) + record.errors.add(attr_name, :after, :value => r, :default => options[:after_message] % r) break end end lib/validates_date_time.rb @@ -69,6 +69,18 @@ class DateTest < Test::Unit::TestCase assert_invalid_and_errors_match /avant/, :date_of_arrival => 2.years.from_now, :date_of_departure => 2.years.ago assert_invalid_and_errors_match /apres/, :date_of_arrival => '1792-03-03' end + + def test_before_and_after_with_i18n + load_path = I18n.load_path + I18n.load_path.clear + I18n.load_path << File.join(File.dirname(__FILE__),'fixtures/en.yml') + I18n.reload! + assert_invalid_and_errors_match /i18n_before/, :date_of_death => (Date.today + 1).to_s + assert_invalid_and_errors_match /i18n_after/, :date_of_birth => (Date.today + 1).to_s + I18n.load_path.clear + I18n.load_path = load_path + I18n.reload! + end def test_dates_with_unknown_year assert p.update_attributes!(:date_of_birth => '9999-12-11') test/date_test.rb 7b5bbd71000045370b7b3d04bf72b51bbf32fa27 Roman Shterenzon roman.shterenzon@gmail.com http://github.com/romanbsd/validates_date_time/commit/968a3ebd9df5b4c3b162ab6bcfeb9343b14995a9 968a3ebd9df5b4c3b162ab6bcfeb9343b14995a9 2009-02-19T04:07:25-08:00 2009-02-19T04:07:25-08:00 Add support for value interpolation and add tests 52f2dcc6db286950fc32294722c3ffaadef84042 Roman Shterenzon roman.shterenzon@gmail.com