aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/scoping
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-04-27 15:44:25 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-04-27 15:44:25 +0900
commit86e74a083a2412676eb18b634d4623b0b76d1d79 (patch)
tree743430bc526df06b2353b03714c19765524cca01 /activerecord/test/cases/scoping
parent1583e260f9278986f3c4ea3702c081727838c290 (diff)
downloadrails-86e74a083a2412676eb18b634d4623b0b76d1d79.tar.gz
rails-86e74a083a2412676eb18b634d4623b0b76d1d79.tar.bz2
rails-86e74a083a2412676eb18b634d4623b0b76d1d79.zip
Restore `fixtures :author_addresses`
This change reverted in eac6f369 but it is needed for data integrity. See #25328.
Diffstat (limited to 'activerecord/test/cases/scoping')
-rw-r--r--activerecord/test/cases/scoping/relation_scoping_test.rb4
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