From 673daeabca18a3d96171c86bcdd03fd3d0091a73 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 5 Jun 2007 03:47:02 +0000 Subject: Fixtures: people(:technomancy, :josh) returns both fixtures. Closes #7880. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6940 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/associations_test.rb | 4 ++-- activerecord/test/fixtures_test.rb | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'activerecord/test') diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index fe2a720c32..9dec102e7c 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -743,9 +743,9 @@ class HasManyAssociationsTest < Test::Unit::TestCase def test_find_or_create number_of_clients = companies(:first_firm).clients.size the_client = companies(:first_firm).clients.find_or_create_by_name("Yet another client") - assert_equal number_of_clients + 1, companies(:first_firm, :refresh).clients.size + assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size assert_equal the_client, companies(:first_firm).clients.find_or_create_by_name("Yet another client") - assert_equal number_of_clients + 1, companies(:first_firm, :refresh).clients.size + assert_equal number_of_clients + 1, companies(:first_firm, :reload).clients.size end def test_deleting diff --git a/activerecord/test/fixtures_test.rb b/activerecord/test/fixtures_test.rb index d9973683cc..3e61c7b465 100755 --- a/activerecord/test/fixtures_test.rb +++ b/activerecord/test/fixtures_test.rb @@ -259,6 +259,19 @@ class FixturesWithoutInstantiationTest < Test::Unit::TestCase assert_equal "Jamis", developers(:jamis).name assert_equal 50, accounts(:signals37).credit_limit end + + def test_accessor_methods_with_multiple_args + assert_equal 2, topics(:first, :second).size + assert_raise(StandardError) { topics([:first, :second]) } + end + + uses_mocha 'reloading_fixtures_through_accessor_methods' do + def test_reloading_fixtures_through_accessor_methods + assert_equal "The First Topic", topics(:first).title + @loaded_fixtures['topics']['first'].expects(:find).returns(stub(:title => "Fresh Topic!")) + assert_equal "Fresh Topic!", topics(:first, true).title + end + end end -- cgit v1.2.3