diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
| commit | 4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch) | |
| tree | d2bd733be55a75d5aab8fbcfc4adbb83034980bc /activerecord/test/cases | |
| parent | 97716e6273018c5531c7c927d226af823a0a3820 (diff) | |
| parent | 0626668374d092a3cf72b16fe24944beffddf804 (diff) | |
| download | rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2 rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/identity_map_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/invalid_date_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb index cd9c358799..3efc8bf559 100644 --- a/activerecord/test/cases/identity_map_test.rb +++ b/activerecord/test/cases/identity_map_test.rb @@ -164,7 +164,7 @@ class IdentityMapTest < ActiveRecord::TestCase end ############################################################################## - # Tests checking dirty attribute behaviour with IM # + # Tests checking dirty attribute behavior with IM # ############################################################################## def test_loading_new_instance_should_not_update_dirty_attributes @@ -238,7 +238,7 @@ class IdentityMapTest < ActiveRecord::TestCase end ############################################################################## - # Tests checking Identity Map behaviour with preloaded associations, joins, # + # Tests checking Identity Map behavior with preloaded associations, joins, # # includes etc. # ############################################################################## diff --git a/activerecord/test/cases/invalid_date_test.rb b/activerecord/test/cases/invalid_date_test.rb index 2de50b224c..98cda010ae 100644 --- a/activerecord/test/cases/invalid_date_test.rb +++ b/activerecord/test/cases/invalid_date_test.rb @@ -24,9 +24,9 @@ class InvalidDateTest < ActiveRecord::TestCase topic = Topic.new({"last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s}) # Oracle DATE columns are datetime columns and Oracle adapter returns Time value if current_adapter?(:OracleAdapter) - assert_equal(topic.last_read.to_date, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object") + assert_equal(topic.last_read.to_date, Time.local(*date_src).to_date, "The date should be modified according to the behavior of the Time object") else - assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behaviour of the Time object") + assert_equal(topic.last_read, Time.local(*date_src).to_date, "The date should be modified according to the behavior of the Time object") end end end |