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/method_scoping_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/method_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/method_scoping_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb index d8246f49b8..35f7bc5443 100644 --- a/activerecord/test/cases/method_scoping_test.rb +++ b/activerecord/test/cases/method_scoping_test.rb @@ -379,7 +379,8 @@ class NestedScopingTest < ActiveRecord::TestCase poor_jamis = developers(:poor_jamis) Developer.with_scope(:find => { :conditions => "salary < 100000" }) do Developer.with_scope(:find => { :offset => 1, :order => 'id asc' }) do - assert_sql /ORDER BY id asc / do + # Oracle adapter does not generated space after asc therefore trailing space removed from regex + assert_sql /ORDER BY id asc/ do assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc')) end end |