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:
@@ -4,11 +4,11 @@ class PostFlagTest < ActiveSupport::TestCase
|
||||
context "In all cases" do
|
||||
setup do
|
||||
Timecop.travel(2.weeks.ago) do
|
||||
@alice = FactoryGirl.create(:gold_user)
|
||||
@alice = FactoryBot.create(:gold_user)
|
||||
end
|
||||
CurrentUser.user = @alice
|
||||
CurrentUser.ip_addr = "127.0.0.2"
|
||||
@post = FactoryGirl.create(:post, :tag_string => "aaa")
|
||||
@post = FactoryBot.create(:post, :tag_string => "aaa")
|
||||
end
|
||||
|
||||
teardown do
|
||||
@@ -19,7 +19,7 @@ class PostFlagTest < ActiveSupport::TestCase
|
||||
context "a basic user" do
|
||||
setup do
|
||||
Timecop.travel(2.weeks.ago) do
|
||||
@bob = FactoryGirl.create(:user)
|
||||
@bob = FactoryBot.create(:user)
|
||||
end
|
||||
CurrentUser.user = @bob
|
||||
end
|
||||
@@ -72,18 +72,18 @@ class PostFlagTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
should "not be able to flag a post in the cooldown period" do
|
||||
users = FactoryGirl.create_list(:user, 2, created_at: 2.weeks.ago)
|
||||
flag1 = FactoryGirl.create(:post_flag, post: @post, creator: users.first)
|
||||
users = FactoryBot.create_list(:user, 2, created_at: 2.weeks.ago)
|
||||
flag1 = FactoryBot.create(:post_flag, post: @post, creator: users.first)
|
||||
@post.approve!
|
||||
|
||||
travel_to(PostFlag::COOLDOWN_PERIOD.from_now - 1.minute) do
|
||||
flag2 = FactoryGirl.build(:post_flag, post: @post, creator: users.second)
|
||||
flag2 = FactoryBot.build(:post_flag, post: @post, creator: users.second)
|
||||
assert(flag2.invalid?)
|
||||
assert_match(/cannot be flagged more than once/, flag2.errors[:post].join)
|
||||
end
|
||||
|
||||
travel_to(PostFlag::COOLDOWN_PERIOD.from_now + 1.minute) do
|
||||
flag3 = FactoryGirl.build(:post_flag, post: @post, creator: users.second)
|
||||
flag3 = FactoryBot.build(:post_flag, post: @post, creator: users.second)
|
||||
assert(flag3.valid?)
|
||||
end
|
||||
end
|
||||
@@ -98,13 +98,13 @@ class PostFlagTest < ActiveSupport::TestCase
|
||||
context "a moderator user" do
|
||||
setup do
|
||||
Timecop.travel(2.weeks.ago) do
|
||||
@dave = FactoryGirl.create(:moderator_user)
|
||||
@dave = FactoryBot.create(:moderator_user)
|
||||
end
|
||||
CurrentUser.user = @dave
|
||||
end
|
||||
|
||||
should "not be able to view flags on their own uploads" do
|
||||
@modpost = FactoryGirl.create(:post, :tag_string => "mmm",:uploader_id => @dave.id)
|
||||
@modpost = FactoryBot.create(:post, :tag_string => "mmm",:uploader_id => @dave.id)
|
||||
CurrentUser.scoped(@alice) do
|
||||
@flag1 = PostFlag.create(:post => @modpost, :reason => "aaa", :is_resolved => false)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user