diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-28 07:42:16 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-28 07:42:16 +0000 |
| commit | bc73b838e04a13531523621b11083e9a371d778c (patch) | |
| tree | b413cb8c342c1249cd5e9c20878666ed0d184523 /activerecord/test | |
| parent | 816f37a2adde4449a17712cb0891a15f2c2ea7c0 (diff) | |
| download | rails-bc73b838e04a13531523621b11083e9a371d778c.tar.gz rails-bc73b838e04a13531523621b11083e9a371d778c.tar.bz2 rails-bc73b838e04a13531523621b11083e9a371d778c.zip | |
Made more tests for SQLServer pass (closes #2486) [Tom Ward]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2779 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
| -rwxr-xr-x | activerecord/test/associations_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 6bdafd7868..6a4beb4135 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -1246,7 +1246,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase # SQL Server doesn't have a separate column type just for dates, # so the time is in the string and incorrectly formatted if current_adapter?(:SQLServerAdapter) - assert_equal Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00"), Time.parse(Developer.find(1).projects.first.joined_on).strftime("%Y/%m/%d 00:00:00") + assert_equal Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00"), Developer.find(1).projects.first.joined_on.strftime("%Y/%m/%d 00:00:00") else assert_equal Date.new(2004, 10, 10).to_s, Developer.find(1).projects.first.joined_on.to_s end @@ -1267,8 +1267,8 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase # SQL Server doesn't have a separate column type just for dates, # so the time is in the string and incorrectly formatted if current_adapter?(:SQLServerAdapter) - assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), Time.parse(jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on).strftime("%Y/%m/%d 00:00:00") - assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), Time.parse(developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on).strftime("%Y/%m/%d 00:00:00") + assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00") + assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00") else assert_equal Date.today.to_s, jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s assert_equal Date.today.to_s, developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s |