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:
@@ -3,10 +3,10 @@ require 'test_helper'
|
||||
class ForumTopicTest < ActiveSupport::TestCase
|
||||
context "A forum topic" do
|
||||
setup do
|
||||
@user = FactoryGirl.create(:user)
|
||||
@user = FactoryBot.create(:user)
|
||||
CurrentUser.user = @user
|
||||
CurrentUser.ip_addr = "127.0.0.1"
|
||||
@topic = FactoryGirl.create(:forum_topic, :title => "xxx")
|
||||
@topic = FactoryBot.create(:forum_topic, :title => "xxx")
|
||||
end
|
||||
|
||||
teardown do
|
||||
@@ -37,7 +37,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "that predates the topic" do
|
||||
setup do
|
||||
FactoryGirl.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 16.hours.from_now)
|
||||
FactoryBot.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 16.hours.from_now)
|
||||
end
|
||||
|
||||
should "return false" do
|
||||
@@ -47,7 +47,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "that postdates the topic" do
|
||||
setup do
|
||||
FactoryGirl.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 2.days.from_now)
|
||||
FactoryBot.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 2.days.from_now)
|
||||
end
|
||||
|
||||
should "return true" do
|
||||
@@ -67,7 +67,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
context "and a visit" do
|
||||
context "that predates the topic" do
|
||||
setup do
|
||||
FactoryGirl.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.day.ago)
|
||||
FactoryBot.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.day.ago)
|
||||
end
|
||||
|
||||
should "return false" do
|
||||
@@ -77,7 +77,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "that postdates the topic" do
|
||||
setup do
|
||||
FactoryGirl.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.days.from_now)
|
||||
FactoryBot.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.days.from_now)
|
||||
end
|
||||
|
||||
should "return true" do
|
||||
@@ -99,7 +99,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "with a previous visit" do
|
||||
setup do
|
||||
FactoryGirl.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.day.ago)
|
||||
FactoryBot.create(:forum_topic_visit, user: @user, forum_topic: @topic, last_read_at: 1.day.ago)
|
||||
end
|
||||
|
||||
should "update the visit" do
|
||||
@@ -112,9 +112,9 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "#merge" do
|
||||
setup do
|
||||
@topic2 = FactoryGirl.create(:forum_topic, :title => "yyy")
|
||||
FactoryGirl.create(:forum_post, :topic_id => @topic.id, :body => "xxx")
|
||||
FactoryGirl.create(:forum_post, :topic_id => @topic2.id, :body => "xxx")
|
||||
@topic2 = FactoryBot.create(:forum_topic, :title => "yyy")
|
||||
FactoryBot.create(:forum_post, :topic_id => @topic.id, :body => "xxx")
|
||||
FactoryBot.create(:forum_post, :topic_id => @topic2.id, :body => "xxx")
|
||||
end
|
||||
|
||||
should "merge all the posts in one topic into the other" do
|
||||
@@ -126,7 +126,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
context "constructed with nested attributes for its original post" do
|
||||
should "create a matching forum post" do
|
||||
assert_difference(["ForumTopic.count", "ForumPost.count"], 1) do
|
||||
@topic = FactoryGirl.create(:forum_topic, :title => "abc", :original_post_attributes => {:body => "abc"})
|
||||
@topic = FactoryBot.create(:forum_topic, :title => "abc", :original_post_attributes => {:body => "abc"})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -147,7 +147,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
|
||||
context "updated by a second user" do
|
||||
setup do
|
||||
@second_user = FactoryGirl.create(:user)
|
||||
@second_user = FactoryBot.create(:user)
|
||||
CurrentUser.user = @second_user
|
||||
end
|
||||
|
||||
@@ -160,7 +160,7 @@ class ForumTopicTest < ActiveSupport::TestCase
|
||||
context "with multiple posts that has been deleted" do
|
||||
setup do
|
||||
5.times do
|
||||
FactoryGirl.create(:forum_post, :topic_id => @topic.id)
|
||||
FactoryBot.create(:forum_post, :topic_id => @topic.id)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user