diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 18:39:44 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 18:39:44 +0100 |
| commit | 2e50110eac439f3d5d292f1519ae7c79991eb91a (patch) | |
| tree | 5ba10ebd6ddf0a7487754798993d3862ee9ec3b3 /activerecord/test/cases/inheritance_test.rb | |
| parent | a7f09bc12236d9e7bdc2ee34d5fe3c782d6ad385 (diff) | |
| parent | bb1e1776914edf3be7e46b55036c18a64595f919 (diff) | |
| download | rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.tar.gz rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.tar.bz2 rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activerecord/test/cases/inheritance_test.rb')
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 167d3abad9..5cd11e9799 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -137,7 +137,8 @@ class InheritanceTest < ActiveRecord::TestCase def test_update_all_within_inheritance Client.update_all "name = 'I am a client'" assert_equal "I am a client", Client.find(:all).first.name - assert_equal "37signals", Firm.find(:all).first.name + # Order by added as otherwise Oracle tests were failing because of different order of results + assert_equal "37signals", Firm.find(:all, :order => "id").first.name end def test_alt_update_all_within_inheritance |