diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-06-13 04:42:36 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-06-13 04:42:36 +0000 |
| commit | 76e4c1a5584c814a761acee6dc36af589e5fe5be (patch) | |
| tree | 435b5fbca4ee12eba629fa4f858863bda72a1098 /activerecord/test | |
| parent | fa7f4a066466f8587ddd11b96dcbbe5008ab63a9 (diff) | |
| download | rails-76e4c1a5584c814a761acee6dc36af589e5fe5be.tar.gz rails-76e4c1a5584c814a761acee6dc36af589e5fe5be.tar.bz2 rails-76e4c1a5584c814a761acee6dc36af589e5fe5be.zip | |
r1294@iwill: jeremy | 2005-06-13 02:17:42 -0700
Ticket #1281
r1295@iwill: jeremy | 2005-06-13 02:50:50 -0700
Apply patch, tweak, and test.
r1296@iwill: jeremy | 2005-06-13 02:51:04 -0700
Changelog entry.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1410 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
| -rwxr-xr-x | activerecord/test/associations_test.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 05daf9b9c1..1e80ec1ee0 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -345,16 +345,25 @@ class HasManyAssociationsTest < Test::Unit::TestCase def test_find_all_sanitized firm = Firm.find_first assert_equal firm.clients.find_all("name = 'Summit'"), firm.clients.find_all(["name = '%s'", "Summit"]) + summit = firm.clients.find(:all, :conditions => "name = 'Summit'") + assert_equal summit, firm.clients.find(:all, :conditions => ["name = ?", "Summit"]) + assert_equal summit, firm.clients.find(:all, :conditions => ["name = :name", { :name => "Summit" }]) end def test_find_first firm = Firm.find_first + client2 = Client.find(2) assert_equal firm.clients.first, firm.clients.find_first - assert_equal Client.find(2), firm.clients.find_first("type = 'Client'") + assert_equal client2, firm.clients.find_first("type = 'Client'") + assert_equal client2, firm.clients.find(:first, :conditions => "type = 'Client'") end def test_find_first_sanitized - assert_equal Client.find(2), Firm.find_first.clients.find_first(["type = ?", "Client"]) + firm = Firm.find_first + client2 = Client.find(2) + assert_equal client2, firm.clients.find_first(["type = ?", "Client"]) + assert_equal client2, firm.clients.find(:first, :conditions => ['type = ?', 'Client']) + assert_equal client2, firm.clients.find(:first, :conditions => ['type = :type', { :type => 'Client' }]) end def test_find_in_collection |