diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-04-24 21:48:45 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-04-24 21:48:45 -0300 |
| commit | 090539604b7685d838302c1773520622d87bd3d7 (patch) | |
| tree | 20d5c72838ab239e7eb67038467016af6848a7df /activerecord/test/cases | |
| parent | 0e113a040d934958ce3805ce6cda73c655def444 (diff) | |
| download | rails-090539604b7685d838302c1773520622d87bd3d7.tar.gz rails-090539604b7685d838302c1773520622d87bd3d7.tar.bz2 rails-090539604b7685d838302c1773520622d87bd3d7.zip | |
construct_finder_sql now use Arel
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/inner_join_association_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/method_scoping_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb index 7141531740..5f08c40005 100644 --- a/activerecord/test/cases/associations/inner_join_association_test.rb +++ b/activerecord/test/cases/associations/inner_join_association_test.rb @@ -26,7 +26,7 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase def test_construct_finder_sql_applies_association_conditions sql = Author.send(:construct_finder_sql, :joins => :categories_like_general, :conditions => "TERMINATING_MARKER") - assert_match /INNER JOIN .?categories.? ON.*AND.*.?General.?.*TERMINATING_MARKER/, sql + assert_match /INNER JOIN .?categories.? ON.*AND.*.?General.?(.|\n)*TERMINATING_MARKER/, sql end def test_construct_finder_sql_applies_aliases_tables_on_association_conditions diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb index 2165d2f7e8..4edf7558f7 100644 --- a/activerecord/test/cases/method_scoping_test.rb +++ b/activerecord/test/cases/method_scoping_test.rb @@ -379,7 +379,7 @@ 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 + assert_sql /ORDER BY id asc/ do assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc')) end end |