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:
@@ -2,7 +2,7 @@ require 'test_helper'
|
||||
|
||||
class ArtistCommentaryTest < ActiveSupport::TestCase
|
||||
setup do
|
||||
user = FactoryGirl.create(:user)
|
||||
user = FactoryBot.create(:user)
|
||||
CurrentUser.user = user
|
||||
CurrentUser.ip_addr = "127.0.0.1"
|
||||
end
|
||||
@@ -13,21 +13,21 @@ class ArtistCommentaryTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
should "A post should not have more than one commentary" do
|
||||
post = FactoryGirl.create(:post)
|
||||
post = FactoryBot.create(:post)
|
||||
|
||||
assert_raise(ActiveRecord::RecordInvalid) do
|
||||
FactoryGirl.create(:artist_commentary, post_id: post.id)
|
||||
FactoryGirl.create(:artist_commentary, post_id: post.id)
|
||||
FactoryBot.create(:artist_commentary, post_id: post.id)
|
||||
FactoryBot.create(:artist_commentary, post_id: post.id)
|
||||
end
|
||||
end
|
||||
|
||||
context "An artist commentary" do
|
||||
context "when searched" do
|
||||
setup do
|
||||
@post1 = FactoryGirl.create(:post, tag_string: "artcomm1")
|
||||
@post2 = FactoryGirl.create(:post, tag_string: "artcomm2")
|
||||
@artcomm1 = FactoryGirl.create(:artist_commentary, post_id: @post1.id, original_title: "foo", translated_title: "bar")
|
||||
@artcomm2 = FactoryGirl.create(:artist_commentary, post_id: @post2.id, original_title: "", original_description: "", translated_title: "", translated_description: "")
|
||||
@post1 = FactoryBot.create(:post, tag_string: "artcomm1")
|
||||
@post2 = FactoryBot.create(:post, tag_string: "artcomm2")
|
||||
@artcomm1 = FactoryBot.create(:artist_commentary, post_id: @post1.id, original_title: "foo", translated_title: "bar")
|
||||
@artcomm2 = FactoryBot.create(:artist_commentary, post_id: @post2.id, original_title: "", original_description: "", translated_title: "", translated_description: "")
|
||||
end
|
||||
|
||||
should "find the correct match" do
|
||||
@@ -46,7 +46,7 @@ class ArtistCommentaryTest < ActiveSupport::TestCase
|
||||
|
||||
context "when created" do
|
||||
should "create a new version" do
|
||||
@artcomm = FactoryGirl.create(:artist_commentary, original_title: "foo")
|
||||
@artcomm = FactoryBot.create(:artist_commentary, original_title: "foo")
|
||||
|
||||
assert_equal(1, @artcomm.versions.size)
|
||||
assert_equal("foo", @artcomm.versions.last.original_title)
|
||||
@@ -55,8 +55,8 @@ class ArtistCommentaryTest < ActiveSupport::TestCase
|
||||
|
||||
context "when updated" do
|
||||
setup do
|
||||
@post = FactoryGirl.create(:post)
|
||||
@artcomm = FactoryGirl.create(:artist_commentary, post_id: @post.id)
|
||||
@post = FactoryBot.create(:post)
|
||||
@artcomm = FactoryBot.create(:artist_commentary, post_id: @post.id)
|
||||
@artcomm.reload
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user