diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-27 00:27:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 00:27:19 -0700 |
| commit | 5974334aeb23c21100af5bf877b385dbbe762bc6 (patch) | |
| tree | b5637d0f48aae2de21bb7c5f790223aefa1eb2ba /activerecord/test/cases/scoping/relation_scoping_test.rb | |
| parent | 28cd12c3454338450c6a505ae9997380065367c8 (diff) | |
| parent | 86e74a083a2412676eb18b634d4623b0b76d1d79 (diff) | |
| download | rails-5974334aeb23c21100af5bf877b385dbbe762bc6.tar.gz rails-5974334aeb23c21100af5bf877b385dbbe762bc6.tar.bz2 rails-5974334aeb23c21100af5bf877b385dbbe762bc6.zip | |
Merge pull request #28899 from kamipo/restore_fixture_author_addresses
Restore `fixtures :author_addresses`
Diffstat (limited to 'activerecord/test/cases/scoping/relation_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/scoping/relation_scoping_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb index a1ae57fdbb..3fbff7664b 100644 --- a/activerecord/test/cases/scoping/relation_scoping_test.rb +++ b/activerecord/test/cases/scoping/relation_scoping_test.rb @@ -10,7 +10,7 @@ require "models/person" require "models/reference" class RelationScopingTest < ActiveRecord::TestCase - fixtures :authors, :developers, :projects, :comments, :posts, :developers_projects + fixtures :authors, :author_addresses, :developers, :projects, :comments, :posts, :developers_projects setup do developers(:david) @@ -238,7 +238,7 @@ class RelationScopingTest < ActiveRecord::TestCase end class NestedRelationScopingTest < ActiveRecord::TestCase - fixtures :authors, :developers, :projects, :comments, :posts + fixtures :authors, :author_addresses, :developers, :projects, :comments, :posts def test_merge_options Developer.where("salary = 80000").scoping do |