Permalink
Browse files

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
  • Loading branch information...
1 parent d6785e9 commit 673daeabca18a3d96171c86bcdd03fd3d0091a73 @jeremy jeremy committed Jun 5, 2007
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixtures: people(:technomancy, :josh) returns both fixtures. #7880 [technomancy, Josh Peek]
+
* Calculations support non-numeric foreign keys. #8154 [kamal]
* with_scope is protected. #8524 [Josh Peek]
@@ -501,20 +501,26 @@ def self.require_fixture_classes(table_names=nil)
end
end
- def self.setup_fixture_accessors(table_names=nil)
+ def self.setup_fixture_accessors(table_names = nil)
(table_names || fixture_table_names).each do |table_name|
- table_name = table_name.to_s.tr('.','_')
+ table_name = table_name.to_s.tr('.', '_')
+
+ define_method(table_name) do |*fixtures|
+ force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
- define_method(table_name) do |fixture, *optionals|
- force_reload = optionals.shift
@fixture_cache[table_name] ||= Hash.new
- @fixture_cache[table_name][fixture] = nil if force_reload
- if @loaded_fixtures[table_name][fixture.to_s]
- @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
- else
- raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+ instances = fixtures.map do |fixture|
+ @fixture_cache[table_name].delete(fixture) if force_reload
+
+ if @loaded_fixtures[table_name][fixture.to_s]
+ @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
+ else
+ raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+ end
end
+
+ instances.size == 1 ? instances.first : instances
end
end
end
@@ -743,9 +743,9 @@ def test_find_or_initialize
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
@@ -259,6 +259,19 @@ def test_accessor_methods
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

0 comments on commit 673daea

Please sign in to comment.