diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 22:11:16 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 22:11:16 -0500 |
| commit | 127509c071b4f983f2beafc8766e990670a21215 (patch) | |
| tree | d8804c1343af0a30cb26d72c8d06150fbfd30b16 /activerecord/test/cases/scoping/relation_scoping_test.rb | |
| parent | b6ffb5efcb694a9302453b8d2081f02090a90c62 (diff) | |
| download | rails-127509c071b4f983f2beafc8766e990670a21215.tar.gz rails-127509c071b4f983f2beafc8766e990670a21215.tar.bz2 rails-127509c071b4f983f2beafc8766e990670a21215.zip | |
Revert "Merge pull request #21233 from mtsmfm/disable-referential-integrity-without-superuser-privileges"
This reverts commit eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa, reversing
changes made to 5c40239d3104543e70508360d27584a3e4dc5baf.
Reason: Broke the isolated tests.
https://travis-ci.org/rails/rails/builds/188721346
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 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 |