diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-10-29 19:37:33 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-10-29 19:37:33 +0100 |
commit | 38061a7becdcfb267a37bc200b846196bd32e2b1 (patch) | |
tree | dc8217783056a188716bd0da25ef30fe8fb09d63 | |
parent | c087cfc6717335c1cd4b8e438004cedac2dfa492 (diff) | |
parent | 0c843640b49e9ca41232d1402f26780e4f511275 (diff) | |
download | rails-38061a7becdcfb267a37bc200b846196bd32e2b1.tar.gz rails-38061a7becdcfb267a37bc200b846196bd32e2b1.tar.bz2 rails-38061a7becdcfb267a37bc200b846196bd32e2b1.zip |
Merge pull request #22106 from jamis/fix_default_fixture_class_names
default value for FixtureSet.fixture_class_names ought to be a Class
-rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 17e7c828b9..deb7d7d06d 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -875,9 +875,7 @@ module ActiveRecord self.pre_loaded_fixtures = false self.config = ActiveRecord::Base - self.fixture_class_names = Hash.new do |h, fixture_set_name| - h[fixture_set_name] = ActiveRecord::FixtureSet.default_fixture_model_name(fixture_set_name, self.config) - end + self.fixture_class_names = {} silence_warnings do define_singleton_method :use_transactional_tests do diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index a0eaa66e94..f30ed4fcc8 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -955,3 +955,17 @@ class FixturesWithAbstractBelongsTo < ActiveRecord::TestCase assert_equal pirates(:blackbeard), doubloons(:blackbeards_doubloon).pirate end end + +class FixtureClassNamesTest < ActiveRecord::TestCase + def setup + @saved_cache = self.fixture_class_names.dup + end + + def teardown + self.fixture_class_names.replace(@saved_cache) + end + + test "fixture_class_names returns nil for unregistered identifier" do + assert_nil self.fixture_class_names['unregistered_identifier'] + end +end |