diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2016-09-13 13:21:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 13:21:28 -0400 |
| commit | c49751be1f528a258572c7ecce8e066807352528 (patch) | |
| tree | 74d4d9599a8abb808253412a48e6c6239f533a54 /activerecord | |
| parent | 16b1816b1ac2204ec8a88436b8b170d0356ee8e5 (diff) | |
| parent | 1b128f89748c7cf12481684e473f7c884993055f (diff) | |
| download | rails-c49751be1f528a258572c7ecce8e066807352528.tar.gz rails-c49751be1f528a258572c7ecce8e066807352528.tar.bz2 rails-c49751be1f528a258572c7ecce8e066807352528.zip | |
Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_names
remove duplicated fixture set names
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/fixtures/all/namespaced/accounts.yml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 40a9aa2783..8b47fbdbe4 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -902,7 +902,7 @@ module ActiveRecord def fixtures(*fixture_set_names) if fixture_set_names.first == :all - fixture_set_names = Dir["#{fixture_path}/{**,*}/*.{yml}"] + fixture_set_names = Dir["#{fixture_path}/{**,*}/*.{yml}"].uniq fixture_set_names.map! { |f| f[(fixture_path.to_s.size + 1)..-5] } else fixture_set_names = fixture_set_names.flatten.map(&:to_s) diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index 24a9894f19..66b230d9d2 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -728,7 +728,7 @@ class LoadAllFixturesTest < ActiveRecord::TestCase self.class.fixtures :all if File.symlink? FIXTURES_ROOT + "/all/admin" - assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + assert_equal %w(admin/accounts admin/users developers namespaced/accounts people tasks), fixture_table_names.sort end ensure ActiveRecord::FixtureSet.reset_cache @@ -741,7 +741,7 @@ class LoadAllFixturesWithPathnameTest < ActiveRecord::TestCase self.class.fixtures :all if File.symlink? FIXTURES_ROOT + "/all/admin" - assert_equal %w(admin/accounts admin/users developers people tasks), fixture_table_names.sort + assert_equal %w(admin/accounts admin/users developers namespaced/accounts people tasks), fixture_table_names.sort end ensure ActiveRecord::FixtureSet.reset_cache diff --git a/activerecord/test/fixtures/all/namespaced/accounts.yml b/activerecord/test/fixtures/all/namespaced/accounts.yml new file mode 100644 index 0000000000..9e341a15af --- /dev/null +++ b/activerecord/test/fixtures/all/namespaced/accounts.yml @@ -0,0 +1,2 @@ +signals37: + name: 37signals |