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,35 +1,29 @@
require 'test_helper'
class UsersControllerTest < ActionController::TestCase
class UsersControllerTest < ActionDispatch::IntegrationTest
context "The users controller" do
setup do
@user = FactoryGirl.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
end
teardown do
CurrentUser.user = nil
@user = create(:user)
end
context "index action" do
should "list all users" do
get :index
get users_path
assert_response :success
end
should "list all users for /users?name=<name>" do
get :index, { name: @user.name }
get users_path, params: { name: @user.name }
assert_redirected_to(@user)
end
should "raise error for /users?name=<nonexistent>" do
get :index, { name: "nobody" }
get users_path, params: { name: "nobody" }
assert_response :error
end
should "list all users (with search)" do
get :index, {:search => {:name_matches => @user.name}}
get users_path, params: {:search => {:name_matches => @user.name}}
assert_response :success
end
end
@@ -37,18 +31,20 @@ class UsersControllerTest < ActionController::TestCase
context "show action" do
setup do
# flesh out profile to get more test coverage of user presenter.
@user = FactoryGirl.create(:banned_user, can_approve_posts: true, is_super_voter: true)
FactoryGirl.create(:saved_search, user: @user)
FactoryGirl.create(:post, uploader: @user, tag_string: "fav:#{@user.name}")
@user = create(:banned_user, can_approve_posts: true, is_super_voter: true)
as_user do
create(:saved_search, user: @user)
create(:post, uploader: @user, tag_string: "fav:#{@user.name}")
end
end
should "render" do
get :show, {:id => @user.id}
get user_path(@user)
assert_response :success
end
should "show hidden attributes to the owner" do
get :show, {id: @user.id, format: :json}, {user_id: @user.id}
get_auth user_path(@user), @user, params: {format: :json}
json = JSON.parse(response.body)
assert_response :success
@@ -56,9 +52,9 @@ class UsersControllerTest < ActionController::TestCase
end
should "not show hidden attributes to others" do
another = FactoryGirl.create(:user)
@another = create(:user)
get :show, {id: another.id, format: :json}, {user_id: @user.id}
get_auth user_path(@another), @user, params: {format: :json}
json = JSON.parse(response.body)
assert_response :success
@@ -66,7 +62,7 @@ class UsersControllerTest < ActionController::TestCase
end
should "strip '?' from attributes" do
get :show, {id: @user.id, format: :xml}, {user_id: @user.id}
get_auth user_path(@user), @user, params: {format: :xml}
xml = Hash.from_xml(response.body)
assert_response :success
@@ -80,7 +76,7 @@ class UsersControllerTest < ActionController::TestCase
end
should "render" do
get :new
get new_user_path
assert_response :success
end
end
@@ -88,58 +84,53 @@ class UsersControllerTest < ActionController::TestCase
context "create action" do
should "create a user" do
assert_difference("User.count", 1) do
post :create, {:user => {:name => "xxx", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}, {:user_id => @user.id}
assert_not_nil(assigns(:user))
assert_equal([], assigns(:user).errors.full_messages)
post users_path, params: {:user => {:name => "xxx", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}
end
end
should "not allow registering multiple accounts with the same IP" do
Danbooru.config.unstub(:enable_sock_puppet_validation?)
request.env["REMOTE_ADDR"] = "1.2.3.4"
CurrentUser.user = nil
context "with sockpuppet validation enabled" do
setup do
Danbooru.config.unstub(:enable_sock_puppet_validation?)
@user.update(last_ip_addr: "127.0.0.1")
end
post :create, {:user => {:name => "user", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}, {}
session.clear
post :create, {:user => {:name => "dupe", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}, {}
assert_equal(true, User.where(name: "user").exists?)
assert_equal(false, User.where(name: "dupe").exists?)
assert_equal(IPAddr.new("1.2.3.4"), User.find_by_name("user").last_ip_addr)
assert_match(/Sign up failed: Last ip addr was used recently/, flash[:notice])
should "not allow registering multiple accounts with the same IP" do
assert_difference("User.count", 0) do
post users_path, params: {:user => {:name => "dupe", :password => "xxxxx1", :password_confirmation => "xxxxx1"}}
end
end
end
end
context "edit action" do
setup do
@user = FactoryGirl.create(:user)
@user = create(:user)
end
should "render" do
get :edit, {:id => @user.id}, {:user_id => @user.id}
get_auth edit_user_path(@user), @user
assert_response :success
end
end
context "update action" do
setup do
@user = FactoryGirl.create(:user)
@user = create(:user)
end
should "update a user" do
post :update, {:id => @user.id, :user => {:favorite_tags => "xyz"}}, {:user_id => @user.id}
put_auth user_path(@user), @user, params: {:user => {:favorite_tags => "xyz"}}
@user.reload
assert_equal("xyz", @user.favorite_tags)
end
context "changing the level" do
setup do
@cuser = FactoryGirl.create(:user)
@cuser = create(:user)
end
should "not work" do
post :update, {:id => @user.id, :user => {:level => 40}}, {:user_id => @cuser.id}
put_auth user_path(@user), @cuser, params: {:user => {:level => 40}}
@user.reload
assert_equal(20, @user.level)
end
@@ -147,8 +138,8 @@ class UsersControllerTest < ActionController::TestCase
context "for a banned user" do
should "allow the user to edit their settings" do
@user = FactoryGirl.create(:banned_user)
post :update, {:id => @user.id, :user => {:favorite_tags => "xyz"}}, {:user_id => @user.id}
@user = create(:banned_user)
put_auth user_path(@user), @user, params: {:user => {:favorite_tags => "xyz"}}
assert_equal("xyz", @user.reload.favorite_tags)
end