Raise error on unpermitted params.

Fail loudly if we forget to whitelist a param instead of silently
ignoring it.

misc models: convert to strong params.

artist commentaries: convert to strong params.

* Disallow changing or setting post_id to a nonexistent post.

artists: convert to strong params.

* Disallow setting `is_banned` in create/update actions. Changing it
  this way instead of with the ban/unban actions would leave the artist in
  a partially banned state.

bans: convert to strong params.

* Disallow changing the user_id after the ban has been created.

comments: convert to strong params.

favorite groups: convert to strong params.

news updates: convert to strong params.

post appeals: convert to strong params.

post flags: convert to strong params.

* Disallow users from setting the `is_deleted` / `is_resolved` flags.

ip bans: convert to strong params.

user feedbacks: convert to strong params.

* Disallow users from setting `disable_dmail_notification` when creating feedbacks.
* Disallow changing the user_id after the feedback has been created.

notes: convert to strong params.

wiki pages: convert to strong params.

* Also fix non-Builders being able to delete wiki pages.

saved searches: convert to strong params.

pools: convert to strong params.

* Disallow setting `post_count` or `is_deleted` in create/update actions.

janitor trials: convert to strong params.

post disapprovals: convert to strong params.

* Factor out quick-mod bar to shared partial.
* Fix quick-mod bar to use `Post#is_approvable?` to determine visibility
  of Approve button.

dmail filters: convert to strong params.

password resets: convert to strong params.

user name change requests: convert to strong params.

posts: convert to strong params.

users: convert to strong params.

* Disallow setting password_hash, last_logged_in_at, last_forum_read_at,
  has_mail, and dmail_filter_attributes[user_id].

* Remove initialize_default_image_size (dead code).

uploads: convert to strong params.

* Remove `initialize_status` because status already defaults to pending
  in the database.

tag aliases/implications: convert to strong params.

tags: convert to strong params.

forum posts: convert to strong params.

* Disallow changing the topic_id after creating the post.
* Disallow setting is_deleted (destroy/undelete actions should be used instead).
* Remove is_sticky / is_locked (nonexistent attributes).

forum topics: convert to strong params.

* merges https://github.com/evazion/danbooru/tree/wip-rails-5.1
* lock pg gem to 0.21 (1.0.0 is incompatible with rails 5.1.4)
* switch to factorybot and change all references

Co-authored-by: r888888888 <r888888888@gmail.com>
Co-authored-by: evazion <noizave@gmail.com>

add diffs
This commit is contained in:
r888888888
2018-04-02 10:51:26 -07:00
committed by Albert Yi
parent 01eda51020
commit abce4d2551
362 changed files with 4796 additions and 4799 deletions

View File

@@ -3,7 +3,7 @@ require 'test_helper'
class PostDisapprovalTest < ActiveSupport::TestCase
context "In all cases" do
setup do
@alice = FactoryGirl.create(:moderator_user)
@alice = FactoryBot.create(:moderator_user)
CurrentUser.user = @alice
CurrentUser.ip_addr = "127.0.0.1"
end
@@ -15,8 +15,8 @@ class PostDisapprovalTest < ActiveSupport::TestCase
context "A post disapproval" do
setup do
@post_1 = FactoryGirl.create(:post, :is_pending => true)
@post_2 = FactoryGirl.create(:post, :is_pending => true)
@post_1 = FactoryBot.create(:post, :is_pending => true)
@post_2 = FactoryBot.create(:post, :is_pending => true)
end
context "made by alice" do
@@ -37,7 +37,7 @@ class PostDisapprovalTest < ActiveSupport::TestCase
context "when the current user is brittony" do
setup do
@brittony = FactoryGirl.create(:moderator_user)
@brittony = FactoryBot.create(:moderator_user)
CurrentUser.user = @brittony
end
@@ -50,8 +50,8 @@ class PostDisapprovalTest < ActiveSupport::TestCase
context "for a post that has been approved" do
setup do
@post = FactoryGirl.create(:post)
@user = FactoryGirl.create(:user)
@post = FactoryBot.create(:post)
@user = FactoryBot.create(:user)
Timecop.travel(2.months.ago) do
@disapproval = PostDisapproval.create(:user => @user, :post => @post)
end
@@ -66,20 +66,20 @@ class PostDisapprovalTest < ActiveSupport::TestCase
context "when sending dmails" do
setup do
@uploaders = FactoryGirl.create_list(:user, 2)
@disapprovers = FactoryGirl.create_list(:mod_user, 2)
@uploaders = FactoryBot.create_list(:user, 2)
@disapprovers = FactoryBot.create_list(:mod_user, 2)
# 2 uploaders, with 2 uploads each, and 2 disapprovals on each upload.
@uploaders.each do |uploader|
FactoryGirl.create_list(:post, 2, uploader: uploader).each do |post|
FactoryGirl.create(:post_disapproval, post: post, user: @disapprovers[0])
FactoryGirl.create(:post_disapproval, post: post, user: @disapprovers[1])
FactoryBot.create_list(:post, 2, uploader: uploader).each do |post|
FactoryBot.create(:post_disapproval, post: post, user: @disapprovers[0])
FactoryBot.create(:post_disapproval, post: post, user: @disapprovers[1])
end
end
end
should "dmail the uploaders" do
bot = FactoryGirl.create(:user)
bot = FactoryBot.create(:user)
User.stubs(:system).returns(bot)
assert_difference(["@uploaders[0].dmails.count", "@uploaders[1].dmails.count"], 1) do