aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/scoping
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-04-26 13:39:05 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-04-26 13:39:05 -0700
commiteac6f3690fd245b9d72aadcfa365ed16c4ef8b96 (patch)
treee68341c483f87df227b64e7a873ebbed3e814348 /activerecord/test/cases/scoping
parentce2abffc0e29f562da26f89d7f07aeaf06a9cbcd (diff)
downloadrails-eac6f3690fd245b9d72aadcfa365ed16c4ef8b96.tar.gz
rails-eac6f3690fd245b9d72aadcfa365ed16c4ef8b96.tar.bz2
rails-eac6f3690fd245b9d72aadcfa365ed16c4ef8b96.zip
Revert "Merge pull request #27636 from mtsmfm/disable-referential-integrity-without-superuser-privilege-take-2"
This reverts commit c1faca6333abe4b938b98fedc8d1f47b88209ecf, reversing changes made to 8c658a0ecc7f2b5fc015d424baf9edf6f3eb2b0b. See https://github.com/rails/rails/pull/27636#issuecomment-297534129
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 3fbff7664b..a1ae57fdbb 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, :author_addresses, :developers, :projects, :comments, :posts, :developers_projects
+ fixtures :authors, :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, :author_addresses, :developers, :projects, :comments, :posts
+ fixtures :authors, :developers, :projects, :comments, :posts
def test_merge_options
Developer.where("salary = 80000").scoping do