diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-04-27 15:44:25 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-04-27 15:44:25 +0900 |
| commit | 86e74a083a2412676eb18b634d4623b0b76d1d79 (patch) | |
| tree | 743430bc526df06b2353b03714c19765524cca01 /activerecord/test/cases/relation | |
| parent | 1583e260f9278986f3c4ea3702c081727838c290 (diff) | |
| download | rails-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/relation')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/relation/where_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 67d76de798..64866eaf2d 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -8,7 +8,7 @@ require "models/project" require "models/rating" class RelationMergingTest < ActiveRecord::TestCase - fixtures :developers, :comments, :authors, :posts + fixtures :developers, :comments, :authors, :author_addresses, :posts def test_relation_merging devs = Developer.where("salary >= 80000").merge(Developer.limit(2)).merge(Developer.order("id ASC").where("id < 3")) @@ -114,7 +114,7 @@ class RelationMergingTest < ActiveRecord::TestCase end class MergingDifferentRelationsTest < ActiveRecord::TestCase - fixtures :posts, :authors, :developers + fixtures :posts, :authors, :author_addresses, :developers test "merging where relations" do hello_by_bob = Post.where(body: "hello").joins(:author). diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb index 9a333e0d5a..cbc466d6b8 100644 --- a/activerecord/test/cases/relation/where_test.rb +++ b/activerecord/test/cases/relation/where_test.rb @@ -15,7 +15,7 @@ require "models/vertex" module ActiveRecord class WhereTest < ActiveRecord::TestCase - fixtures :posts, :edges, :authors, :binaries, :essays, :cars, :treasures, :price_estimates + fixtures :posts, :edges, :authors, :author_addresses, :binaries, :essays, :cars, :treasures, :price_estimates def test_where_copies_bind_params author = authors(:david) |