jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Raise error on unpermitted params.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

86
test/functional/comments_controller_test.rb
View File

@@ -1,18 +1,18 @@
require 'test_helper'
class CommentsControllerTest < ActionController::TestCase
class CommentsControllerTest < ActionDispatch::IntegrationTest
context "A comments controller" do
setup do
@mod = FactoryGirl.create(:moderator_user)
@user = FactoryGirl.create(:member_user)
@mod = FactoryBot.create(:moderator_user)
@user = FactoryBot.create(:member_user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
Danbooru.config.stubs(:member_comment_time_threshold).returns(1.week.from_now)
@post = FactoryGirl.create(:post)
@comment = FactoryGirl.create(:comment, :post => @post)
@post = FactoryBot.create(:post)
@comment = FactoryBot.create(:comment, :post => @post)
CurrentUser.scoped(@mod) do
@mod_comment = FactoryGirl.create(:comment, :post => @post)
@mod_comment = FactoryBot.create(:comment, :post => @post)
end
end
@@ -23,43 +23,43 @@ class CommentsControllerTest < ActionController::TestCase
context "index action" do
should "render for post" do
xhr :get, :index, { post_id: @post.id, group_by: "post", format: "js" }
get comments_path(post_id: @post.id, group_by: "post", format: "js")
assert_response :success
end
should "render by post" do
get :index, {:group_by => "post"}
get comments_path(group_by: "post")
assert_response :success
end
should "render by comment" do
get :index, {:group_by => "comment"}
get comments_path(group_by: "comment")
assert_response :success
end
should "render for atom feeds" do
get :index, {:format => "atom"}
get comments_path(format: "atom")
assert_response :success
end
end
context "search action" do
should "render" do
get :search
get search_comments_path
assert_response :success
end
end
context "show action" do
should "render" do
get :show, {:id => @comment.id}
get comment_path(@comment.id)
assert_response :success
end
end
context "edit action" do
should "render" do
get :edit, {:id => @comment.id}, {:user_id => @user.id}
get_auth edit_comment_path(@comment.id), @user
assert_response :success
end
end
@@ -67,13 +67,13 @@ class CommentsControllerTest < ActionController::TestCase
context "update action" do
context "when updating another user's comment" do
should "succeed if updater is a moderator" do
post :update, {:id => @comment.id, :comment => {:body => "abc"}}, {:user_id => @mod.id}
put_auth comment_path(@comment.id), @user, params: {comment: {body: "abc"}}
assert_equal("abc", @comment.reload.body)
assert_redirected_to post_path(@comment.post)
end
should "fail if updater is not a moderator" do
post :update, {:id => @mod_comment.id, :comment => {:body => "abc"}}, {:user_id => @user.id}
put_auth comment_path(@mod_comment.id), @user, params: {comment: {body: "abc"}}
assert_not_equal("abc", @mod_comment.reload.body)
assert_response 403
end
@@ -81,51 +81,43 @@ class CommentsControllerTest < ActionController::TestCase
context "when stickying a comment" do
should "succeed if updater is a moderator" do
CurrentUser.user = @mod
post :update, {:id => @comment.id, :comment => {:is_sticky => true}}, {:user_id => @mod.id}
put_auth comment_path(@comment.id), @mod, params: {comment: {is_sticky: true}}
assert_equal(true, @comment.reload.is_sticky)
assert_redirected_to @comment.post
end
should "fail if updater is not a moderator" do
post :update, {:id => @comment.id, :comment => {:is_sticky => true}}, {:user_id => @user.id}
put_auth comment_path(@comment.id), @user, params: {comment: {is_sticky: true}}
assert_equal(false, @comment.reload.is_sticky)
assert_redirected_to @comment.post
end
end
should "update the body" do
post :update, {:id => @comment.id, :comment => {:body => "abc"}}, {:user_id => @comment.creator_id}
put_auth comment_path(@comment.id), @comment.creator, params: {comment: {body: "abc"}}
assert_equal("abc", @comment.reload.body)
assert_redirected_to post_path(@comment.post)
end
should "allow changing the body and is_deleted" do
params = {
id: @comment.id,
comment: {
body: "herp derp",
do_not_bump_post: true,
is_deleted: true,
post_id: FactoryGirl.create(:post).id,
}
}
post :update, params, { :user_id => @comment.creator_id }
@comment.reload
assert_equal("herp derp", @comment.body)
assert_equal(false, @comment.do_not_bump_post)
put_auth comment_path(@comment.id), @comment.creator, params: {comment: {body: "herp derp", is_deleted: true}}
assert_equal("herp derp", @comment.reload.body)
assert_equal(true, @comment.is_deleted)
assert_equal(@post.id, @comment.post_id)
assert_redirected_to post_path(@post)
end
should "not allow changing do_not_bump_post or post_id" do
as_user do
@another_post = create(:post)
end
put_auth comment_path(@comment.id), @comment.creator, params: {do_not_bump_post: true, post_id: @another_post.id}
assert_equal(false, @comment.reload.do_not_bump_post)
assert_equal(@post.id, @comment.post_id)
end
end
context "new action" do
should "redirect" do
get :new, {}, {:user_id => @user.id}
get_auth new_comment_path, @user
assert_redirected_to comments_path
end
end
@@ -133,31 +125,35 @@ class CommentsControllerTest < ActionController::TestCase
context "create action"do
should "create a comment" do
assert_difference("Comment.count", 1) do
post :create, {:comment => FactoryGirl.attributes_for(:comment, :post_id => @post.id)}, {:user_id => @user.id}
post_auth comments_path, @user, params: {comment: FactoryBot.attributes_for(:comment, post_id: @post.id)}
end
comment = Comment.last
assert_redirected_to post_path(comment.post)
end
should "not allow commenting on nonexistent posts" do
post :create, {:comment => FactoryGirl.attributes_for(:comment, :post_id => -1)}, {:user_id => @user.id}
assert_response :error
assert_difference("Comment.count", 0) do
post_auth comments_path, @user, params: {comment: FactoryBot.attributes_for(:comment, post_id: -1)}
end
assert_redirected_to comments_path
end
end
context "destroy action" do
should "mark comment as deleted" do
delete :destroy, {:id => @comment.id}, {:user_id => @user.id}
delete_auth comment_path(@comment.id), @user
assert_equal(true, @comment.reload.is_deleted)
assert_redirected_to @comment
end
end
context "undelete action" do
setup do
@comment.delete!
end
should "mark comment as undeleted" do
@comment.delete!
put :undelete, { id: @comment.id }, { user_id: @user.id }
post_auth undelete_comment_path(@comment.id), @user
assert_equal(false, @comment.reload.is_deleted)
assert_redirected_to(@comment)
end