aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 20:58:49 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-16 20:58:49 -0300
commit4877737f29cb927e7a3cda2990d464bcaa9baea1 (patch)
tree3f020d73d0236be823b95232c394fbd5b8bc52f3 /activerecord/test
parentec43d954c536a8ebab8b45d0b2e3a3aa361ec8ad (diff)
parent5866437eefa19a38010c6045b9015b9508dd8a0d (diff)
downloadrails-4877737f29cb927e7a3cda2990d464bcaa9baea1.tar.gz
rails-4877737f29cb927e7a3cda2990d464bcaa9baea1.tar.bz2
rails-4877737f29cb927e7a3cda2990d464bcaa9baea1.zip
Merge pull request #15071 from leafac/issues/11985
Fix `Relation#delete_all` inconsistency
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 6a880c6680..6ab1bd8c8b 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -831,8 +831,12 @@ class RelationTest < ActiveRecord::TestCase
assert davids.loaded?
end
- def test_delete_all_limit_error
+ def test_delete_all_with_unpermitted_relation_raises_error
assert_raises(ActiveRecord::ActiveRecordError) { Author.limit(10).delete_all }
+ assert_raises(ActiveRecord::ActiveRecordError) { Author.uniq.delete_all }
+ assert_raises(ActiveRecord::ActiveRecordError) { Author.group(:name).delete_all }
+ assert_raises(ActiveRecord::ActiveRecordError) { Author.having('SUM(id) < 3').delete_all }
+ assert_raises(ActiveRecord::ActiveRecordError) { Author.offset(10).delete_all }
end
def test_select_with_aggregates