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:
@@ -1,43 +0,0 @@
|
||||
require 'test_helper'
|
||||
|
||||
class DmailFilterTest < ActiveSupport::TestCase
|
||||
def setup
|
||||
super
|
||||
|
||||
@receiver = FactoryGirl.create(:user)
|
||||
@sender = FactoryGirl.create(:user)
|
||||
end
|
||||
|
||||
def create_dmail(body, title)
|
||||
CurrentUser.scoped(@sender, "127.0.0.1") do
|
||||
Dmail.create_split(:to_id => @receiver.id, :body => body, :title => title)
|
||||
end
|
||||
end
|
||||
|
||||
context "a dmail filter for a word" do
|
||||
setup do
|
||||
@dmail_filter = @receiver.create_dmail_filter(:words => "banned")
|
||||
end
|
||||
|
||||
should "filter on that word in the body" do
|
||||
create_dmail("banned", "okay")
|
||||
assert_equal(true, @receiver.dmails.last.is_read?)
|
||||
end
|
||||
|
||||
should "filter on that word in the title" do
|
||||
create_dmail("okay", "banned")
|
||||
assert_equal(true, @receiver.dmails.last.is_read?)
|
||||
end
|
||||
end
|
||||
|
||||
context "a dmail filter for a user name" do
|
||||
setup do
|
||||
@dmail_filter = @receiver.create_dmail_filter(:words => @sender.name)
|
||||
end
|
||||
|
||||
should "filter on the sender" do
|
||||
create_dmail("okay", "okay")
|
||||
assert_equal(true, @receiver.dmails.last.is_read?)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -6,14 +6,14 @@ class PostKeeperManagerTest < ActiveSupport::TestCase
|
||||
context "#check_and_update" do
|
||||
setup do
|
||||
Timecop.travel(1.month.ago) do
|
||||
@alice = FactoryGirl.create(:user)
|
||||
@bob = FactoryGirl.create(:user)
|
||||
@carol = FactoryGirl.create(:user)
|
||||
@alice = FactoryBot.create(:user)
|
||||
@bob = FactoryBot.create(:user)
|
||||
@carol = FactoryBot.create(:user)
|
||||
end
|
||||
PostArchive.sqs_service.stubs(:merge?).returns(false)
|
||||
|
||||
CurrentUser.scoped(@alice) do
|
||||
@post = FactoryGirl.create(:post)
|
||||
@post = FactoryBot.create(:post)
|
||||
end
|
||||
CurrentUser.scoped(@bob) do
|
||||
Timecop.travel(2.hours.from_now) do
|
||||
@@ -37,13 +37,13 @@ class PostKeeperManagerTest < ActiveSupport::TestCase
|
||||
context "#check" do
|
||||
setup do
|
||||
Timecop.travel(1.month.ago) do
|
||||
@alice = FactoryGirl.create(:user)
|
||||
@bob = FactoryGirl.create(:user)
|
||||
@carol = FactoryGirl.create(:user)
|
||||
@alice = FactoryBot.create(:user)
|
||||
@bob = FactoryBot.create(:user)
|
||||
@carol = FactoryBot.create(:user)
|
||||
end
|
||||
|
||||
CurrentUser.scoped(@alice) do
|
||||
@post = FactoryGirl.create(:post)
|
||||
@post = FactoryBot.create(:post)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@ require 'test_helper'
|
||||
class SuperVoterTest < ActiveSupport::TestCase
|
||||
def setup
|
||||
super
|
||||
@user = FactoryGirl.create(:user)
|
||||
@user = FactoryBot.create(:user)
|
||||
end
|
||||
|
||||
context "#init" do
|
||||
setup do
|
||||
@admin = FactoryGirl.create(:admin_user)
|
||||
@admin = FactoryBot.create(:admin_user)
|
||||
@user_mock = mock("user")
|
||||
@user_mock.expects(:user_id).twice.returns(@user.id)
|
||||
@admin_mock = mock("admin")
|
||||
@@ -25,7 +25,7 @@ class SuperVoterTest < ActiveSupport::TestCase
|
||||
|
||||
context "creation" do
|
||||
should "update the is_super_voter field on the user object" do
|
||||
FactoryGirl.create(:super_voter, user: @user)
|
||||
FactoryBot.create(:super_voter, user: @user)
|
||||
@user.reload
|
||||
assert_equal(true, @user.is_super_voter?)
|
||||
end
|
||||
@@ -33,7 +33,7 @@ class SuperVoterTest < ActiveSupport::TestCase
|
||||
|
||||
context "destruction" do
|
||||
should "update the is_super_voter field on the user object" do
|
||||
voter = FactoryGirl.create(:super_voter, user: @user)
|
||||
voter = FactoryBot.create(:super_voter, user: @user)
|
||||
voter.destroy
|
||||
@user.reload
|
||||
assert_equal(false, @user.is_super_voter?)
|
||||
|
||||
Reference in New Issue
Block a user