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:
@@ -5,7 +5,7 @@ require 'test_helper'
|
||||
class PoolTest < ActiveSupport::TestCase
|
||||
setup do
|
||||
Timecop.travel(1.month.ago) do
|
||||
@user = FactoryGirl.create(:user)
|
||||
@user = FactoryBot.create(:user)
|
||||
CurrentUser.user = @user
|
||||
end
|
||||
|
||||
@@ -24,7 +24,7 @@ class PoolTest < ActiveSupport::TestCase
|
||||
|
||||
context "A name" do
|
||||
setup do
|
||||
@pool = FactoryGirl.create(:pool, :name => "xxx")
|
||||
@pool = FactoryBot.create(:pool, :name => "xxx")
|
||||
end
|
||||
|
||||
should "be mapped to a pool id" do
|
||||
@@ -34,7 +34,7 @@ class PoolTest < ActiveSupport::TestCase
|
||||
|
||||
context "A multibyte character name" do
|
||||
setup do
|
||||
@mb_pool = FactoryGirl.create(:pool, :name => "àáâãäå")
|
||||
@mb_pool = FactoryBot.create(:pool, :name => "àáâãäå")
|
||||
end
|
||||
|
||||
should "be mapped to a pool id" do
|
||||
@@ -44,7 +44,7 @@ class PoolTest < ActiveSupport::TestCase
|
||||
|
||||
context "An id number" do
|
||||
setup do
|
||||
@pool = FactoryGirl.create(:pool)
|
||||
@pool = FactoryBot.create(:pool)
|
||||
end
|
||||
|
||||
should "be mapped to a pool id" do
|
||||
@@ -56,10 +56,10 @@ class PoolTest < ActiveSupport::TestCase
|
||||
setup do
|
||||
PoolArchive.stubs(:enabled?).returns(true)
|
||||
|
||||
@pool = FactoryGirl.create(:pool)
|
||||
@p1 = FactoryGirl.create(:post)
|
||||
@p2 = FactoryGirl.create(:post)
|
||||
@p3 = FactoryGirl.create(:post)
|
||||
@pool = FactoryBot.create(:pool)
|
||||
@p1 = FactoryBot.create(:post)
|
||||
@p2 = FactoryBot.create(:post)
|
||||
@p3 = FactoryBot.create(:post)
|
||||
CurrentUser.scoped(@user, "1.2.3.4") do
|
||||
@pool.add!(@p1)
|
||||
end
|
||||
@@ -104,9 +104,9 @@ class PoolTest < ActiveSupport::TestCase
|
||||
|
||||
context "Updating a pool" do
|
||||
setup do
|
||||
@pool = FactoryGirl.create(:pool)
|
||||
@p1 = FactoryGirl.create(:post)
|
||||
@p2 = FactoryGirl.create(:post)
|
||||
@pool = FactoryBot.create(:pool)
|
||||
@p1 = FactoryBot.create(:post)
|
||||
@p2 = FactoryBot.create(:post)
|
||||
end
|
||||
|
||||
context "by adding a new post" do
|
||||
@@ -147,7 +147,7 @@ class PoolTest < ActiveSupport::TestCase
|
||||
context "to a deleted pool" do
|
||||
setup do
|
||||
# must be a builder to update deleted pools.
|
||||
CurrentUser.user = FactoryGirl.create(:builder_user)
|
||||
CurrentUser.user = FactoryBot.create(:builder_user)
|
||||
|
||||
@pool.update_attribute(:is_deleted, true)
|
||||
@pool.post_ids = "#{@pool.post_ids} #{@p2.id}"
|
||||
@@ -215,7 +215,7 @@ class PoolTest < ActiveSupport::TestCase
|
||||
|
||||
should "create new versions for each distinct user" do
|
||||
assert_equal(1, @pool.versions.size)
|
||||
user2 = Timecop.travel(1.month.ago) {FactoryGirl.create(:user)}
|
||||
user2 = Timecop.travel(1.month.ago) {FactoryBot.create(:user)}
|
||||
|
||||
CurrentUser.scoped(user2, "127.0.0.2") do
|
||||
@pool.post_ids = "#{@p1.id}"
|
||||
@@ -262,24 +262,21 @@ class PoolTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
context "when validating names" do
|
||||
should_not allow_value("foo,bar").for(:name)
|
||||
should_not allow_value("foo*bar").for(:name)
|
||||
should_not allow_value("123").for(:name)
|
||||
should_not allow_value("___").for(:name)
|
||||
should_not allow_value(" ").for(:name)
|
||||
|
||||
%w[any none series collection].each do |type|
|
||||
should_not allow_value(type).for(:name)
|
||||
should "not be valid for bad names" do
|
||||
["foo,bar", "foo*bar", "123", "___", " ", "any", "none", "series", "collection"].each do |bad_name|
|
||||
pool = Pool.create(name: bad_name)
|
||||
assert pool.invalid?
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "An existing pool" do
|
||||
setup do
|
||||
@pool = FactoryGirl.create(:pool)
|
||||
@p1 = FactoryGirl.create(:post)
|
||||
@p2 = FactoryGirl.create(:post)
|
||||
@p3 = FactoryGirl.create(:post)
|
||||
@pool = FactoryBot.create(:pool)
|
||||
@p1 = FactoryBot.create(:post)
|
||||
@p2 = FactoryBot.create(:post)
|
||||
@p3 = FactoryBot.create(:post)
|
||||
@pool.add!(@p1)
|
||||
@pool.add!(@p2)
|
||||
@pool.add!(@p3)
|
||||
|
||||
Reference in New Issue
Block a user