Browse files

Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix

TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
  • Loading branch information...
2 parents 0e97aa2 + 73d1046 commit 0d1f98ce65a0c70413546ccb3c36a9b843debcf0 @rafaelfranca rafaelfranca committed Jun 11, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/test/cases/migration/column_attributes_test.rb
View
2 activerecord/test/cases/migration/column_attributes_test.rb
@@ -174,7 +174,7 @@ def test_native_types
assert_not_equal "Z", bob.moment_of_truth.zone
# US/Eastern is -5 hours from GMT
assert_equal Rational(-5, 24), bob.moment_of_truth.offset
- assert_match(/\A-05:?00\Z/, bob.moment_of_truth.zone) #ruby 1.8.6 uses HH:MM, prior versions use HHMM
+ assert_match(/\A-05:00\Z/, bob.moment_of_truth.zone)
assert_equal DateTime::ITALY, bob.moment_of_truth.start
end
end

0 comments on commit 0d1f98c

Please sign in to comment.