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:
r888888888
2018-04-02 10:51:26 -07:00
committed by Albert Yi
parent 01eda51020
commit abce4d2551
362 changed files with 4796 additions and 4799 deletions

View File

@@ -1,96 +1,91 @@
require 'test_helper'
class ForumPostsControllerTest < ActionController::TestCase
class ForumPostsControllerTest < ActionDispatch::IntegrationTest
context "The forum posts controller" do
setup do
@user = FactoryGirl.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@other_user = FactoryGirl.create(:user)
@mod = FactoryGirl.create(:moderator_user)
@forum_topic = FactoryGirl.create(:forum_topic, :title => "my forum topic", :creator => @user)
@forum_post = FactoryGirl.create(:forum_post, :topic_id => @forum_topic.id, :body => "xxx")
end
teardown do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
@user = create(:user)
@other_user = create(:user)
@mod = create(:moderator_user)
as_user do
@forum_topic = create(:forum_topic, :title => "my forum topic")
@forum_post = create(:forum_post, :topic_id => @forum_topic.id, :body => "xxx")
end
end
context "index action" do
should "list all forum posts" do
get :index
get forum_posts_path
assert_response :success
end
context "with search conditions" do
should "list all matching forum posts" do
get :index, {:search => {:body_matches => "xxx"}}
get forum_posts_path, params: {:search => {:body_matches => "xxx"}}
assert_response :success
assert_equal(1, assigns(:forum_posts).size)
assert_select "#forum-post-#{@forum_post.id}"
end
should "list nothing for when the search matches nothing" do
get :index, {:search => {:body_matches => "bababa"}}
get forum_posts_path, params: {:search => {:body_matches => "bababa"}}
assert_response :success
assert_equal(0, assigns(:forum_posts).size)
assert_select "#forum-post-#{@forum_post.id}", false
end
should "list by creator id" do
get :index, {:search => {:creator_id => @user.id}}
get forum_posts_path, params: {:search => {:creator_id => @user.id}}
assert_response :success
assert_equal(1, assigns(:forum_posts).size)
assert_select "#forum-post-#{@forum_post.id}"
end
end
context "with private topics" do
setup do
CurrentUser.user = @mod
@mod_topic = FactoryGirl.create(:mod_up_forum_topic)
@mod_posts = 2.times.map do
FactoryGirl.create(:forum_post, :topic_id => @mod_topic.id)
as(@mod) do
@mod_topic = create(:mod_up_forum_topic)
@mod_posts = 2.times.map do
create(:forum_post, :topic_id => @mod_topic.id)
end
end
@mod_post_ids = ([@forum_post] + @mod_posts).map(&:id).reverse
end
should "list only permitted posts for members" do
CurrentUser.user = @user
get :index, {}, { :user_id => @user.id }
get forum_posts_path
assert_response :success
assert_equal([@forum_post.id], assigns(:forum_posts).map(&:id))
assert_select "#forum-post-#{@forum_post.id}"
assert_select "#forum-post-#{@mod_posts[0].id}", false
end
should "list only permitted posts for mods" do
CurrentUser.user = @mod
get :index, {}, { :user_id => @mod.id }
get_auth forum_posts_path, @mod
assert_response :success
assert_equal(@mod_post_ids, assigns(:forum_posts).map(&:id))
assert_select "#forum-post-#{@mod_posts[0].id}"
end
end
end
context "edit action" do
should "render if the editor is the creator of the topic" do
get :edit, {:id => @forum_post.id}, {:user_id => @user.id}
get_auth edit_forum_post_path(@forum_post), @user
assert_response :success
end
should "render if the editor is a moderator" do
get :edit, {:id => @forum_post.id}, {:user_id => @mod.id}
get_auth edit_forum_post_path(@forum_post), @mod
assert_response :success
end
should "fail if the editor is not the creator of the topic and is not a moderator" do
get :edit, {:id => @forum_post.id}, {:user_id => @other_user.id}
get_auth edit_forum_post_path(@forum_post), @other_user
assert_response(403)
end
end
context "new action" do
should "render" do
get :new, {}, {:user_id => @user.id, :topic_id => @forum_topic.id}, {:user_id => @user.id}
get_auth new_forum_post_path, @user, params: {:topic_id => @forum_topic.id}
assert_response :success
end
end
@@ -98,7 +93,7 @@ class ForumPostsControllerTest < ActionController::TestCase
context "create action" do
should "create a new forum post" do
assert_difference("ForumPost.count", 1) do
post :create, {:forum_post => {:body => "xaxaxa", :topic_id => @forum_topic.id}}, {:user_id => @user.id}
post_auth forum_posts_path, @user, params: {:forum_post => {:body => "xaxaxa", :topic_id => @forum_topic.id}}
end
forum_post = ForumPost.last
@@ -108,8 +103,7 @@ class ForumPostsControllerTest < ActionController::TestCase
context "destroy action" do
should "destroy the posts" do
CurrentUser.user = @mod
post :destroy, {:id => @forum_post.id}, {:user_id => @mod.id}
delete_auth forum_post_path(@forum_post), @mod
assert_redirected_to(forum_post_path(@forum_post))
@forum_post.reload
assert_equal(true, @forum_post.is_deleted?)
@@ -118,12 +112,13 @@ class ForumPostsControllerTest < ActionController::TestCase
context "undelete action" do
setup do
@forum_post.update_attribute(:is_deleted, true)
as(@mod) do
@forum_post.update(is_deleted: true)
end
end
should "restore the post" do
CurrentUser.user = @mod
post :undelete, {:id => @forum_post.id}, {:user_id => @mod.id}
post_auth undelete_forum_post_path(@forum_post), @mod
assert_redirected_to(forum_post_path(@forum_post))
@forum_post.reload
assert_equal(false, @forum_post.is_deleted?)