提交 8c4c07e4 编写于 作者: A Aaron Patterson

fixing variable names to reflect reality

上级 13e72db7
......@@ -872,29 +872,29 @@ def require_fixture_classes(fixture_names = nil)
end
end
def setup_fixture_accessors(table_names = nil)
table_names = Array.wrap(table_names || fixture_table_names)
table_names.each do |table_name|
table_name = table_name.to_s.tr('./', '_')
def setup_fixture_accessors(fixture_names = nil)
fixture_names = Array.wrap(fixture_names || fixture_table_names)
fixture_names.each do |fixture_name|
fixture_name = fixture_name.to_s.tr('./', '_')
redefine_method(table_name) do |*fixtures|
redefine_method(fixture_name) do |*fixtures|
force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
@fixture_cache[table_name] ||= {}
@fixture_cache[fixture_name] ||= {}
instances = fixtures.map do |fixture|
@fixture_cache[table_name].delete(fixture) if force_reload
@fixture_cache[fixture_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
if @loaded_fixtures[fixture_name][fixture.to_s]
@fixture_cache[fixture_name][fixture] ||= @loaded_fixtures[fixture_name][fixture.to_s].find
else
raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
raise StandardError, "No fixture with name '#{fixture}' found for table '#{fixture_name}'"
end
end
instances.size == 1 ? instances.first : instances
end
private table_name
private fixture_name
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册