diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-01-27 01:28:54 -0800 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-27 09:31:48 +0000 |
commit | 1c5bd8a33dd7002c8664e587f968830c1bce3ff8 (patch) | |
tree | 3c95a6907e3c4e37bc1234e2ade5e5ac76d0980a /activerecord/test/cases/finder_test.rb | |
parent | 8e6ef371c59ebe8da7bc5f7fde7c221c2e651f39 (diff) | |
download | rails-1c5bd8a33dd7002c8664e587f968830c1bce3ff8.tar.gz rails-1c5bd8a33dd7002c8664e587f968830c1bce3ff8.tar.bz2 rails-1c5bd8a33dd7002c8664e587f968830c1bce3ff8.zip |
Merge pull request #4715 from pwim/find-create-multi-args
Fix regression from Rails 3.1
Diffstat (limited to 'activerecord/test/cases/finder_test.rb')
-rw-r--r-- | activerecord/test/cases/finder_test.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index 4514a26e57..5a67fcdc0a 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -881,6 +881,17 @@ class FinderTest < ActiveRecord::TestCase assert_equal 23, sig38.client_of end + def test_find_or_create_from_two_attributes_and_hash + number_of_companies = Company.count + sig38 = Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23}) + assert_equal number_of_companies + 1, Company.count + assert_equal sig38, Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23}) + assert sig38.persisted? + assert_equal "38signals", sig38.name + assert_equal 17, sig38.firm_id + assert_equal 23, sig38.client_of + end + def test_find_or_create_from_one_aggregate_attribute number_of_customers = Customer.count created_customer = Customer.find_or_create_by_balance(Money.new(123)) |