diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 10:52:25 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 10:52:25 -0700 |
commit | 0d1f98ce65a0c70413546ccb3c36a9b843debcf0 (patch) | |
tree | a298d9f1b3c183f136036c09eca9a32ae80488fc | |
parent | 0e97aa2e51f810944162faaae2436313c248f8e8 (diff) | |
parent | 73d10466463836555024b7f895032535bdce4b08 (diff) | |
download | rails-0d1f98ce65a0c70413546ccb3c36a9b843debcf0.tar.gz rails-0d1f98ce65a0c70413546ccb3c36a9b843debcf0.tar.bz2 rails-0d1f98ce65a0c70413546ccb3c36a9b843debcf0.zip |
Merge pull request #6706 from amatsuda/ar_timezone_format_test_tiny_fix
TimeZone format is always /[+-]\d{2}:\d{2}/ in Ruby 1.9
-rw-r--r-- | activerecord/test/cases/migration/column_attributes_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb index 18f8d82bfe..3014bbe273 100644 --- a/activerecord/test/cases/migration/column_attributes_test.rb +++ b/activerecord/test/cases/migration/column_attributes_test.rb @@ -174,7 +174,7 @@ module ActiveRecord 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 |