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

95
test/functional/pools_controller_test.rb
View File

@@ -1,63 +1,55 @@
require 'test_helper'
class PoolsControllerTest < ActionController::TestCase
class PoolsControllerTest < ActionDispatch::IntegrationTest
context "The pools controller" do
setup do
Timecop.travel(1.month.ago) do
@user = FactoryGirl.create(:user)
@mod = FactoryGirl.create(:moderator_user)
end
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
@post = FactoryGirl.create(:post)
mock_pool_archive_service!
PoolArchive.sqs_service.stubs(:merge?).returns(false)
start_pool_archive_transaction
travel_to(1.month.ago) do
@user = create(:user)
@mod = create(:moderator_user)
end
as_user do
@post = create(:post)
@pool = create(:pool)
end
end
teardown do
rollback_pool_archive_transaction
CurrentUser.user = nil
end
context "index action" do
setup do
FactoryGirl.create(:pool, :name => "abc")
end
should "list all pools" do
get :index
get pools_path
assert_response :success
end
should "list all pools (with search)" do
get :index, {:search => {:name_matches => "abc"}}
get pools_path, params: {:search => {:name_matches => @pool.name}}
assert_response :success
end
end
context "show action" do
setup do
@pool = FactoryGirl.create(:pool)
end
should "render" do
get :show, {:id => @pool.id}
get pool_path(@pool)
assert_response :success
end
end
context "gallery action" do
should "render" do
pool = FactoryGirl.create(:pool)
get :gallery, {:id => pool.id}
get gallery_pools_path
assert_response :success
end
end
context "new action" do
should "render" do
get :new, {}, { user_id: @user.id }
get_auth new_pool_path, @user
assert_response :success
end
end
@@ -65,39 +57,35 @@ class PoolsControllerTest < ActionController::TestCase
context "create action" do
should "create a pool" do
assert_difference("Pool.count", 1) do
post :create, {:pool => {:name => "xxx", :description => "abc"}}, {:user_id => @user.id}
post_auth pools_path, @user, params: {:pool => {:name => "xxx", :description => "abc"}}
end
end
end
context "edit action" do
should "render" do
pool = FactoryGirl.create(:pool)
get :edit, { id: pool.id }, { user_id: @user.id }
get_auth edit_pool_path(@pool), @user
assert_response :success
end
end
context "update action" do
setup do
@pool = FactoryGirl.create(:pool)
should "update a pool" do
put_auth pool_path(@pool), @user, params: { pool: { name: "xyz", post_ids: @post.id.to_s }}
assert_equal("xyz", @pool.reload.name)
assert_equal(@post.id.to_s, @pool.post_ids)
end
should "update a pool" do
post :update, {:id => @pool.id, :pool => {:name => "xyz"}}, {:user_id => @user.id}
@pool.reload
assert_equal("xyz", @pool.name)
should "not allow updating unpermitted attributes" do
put_auth pool_path(@pool), @user, params: { pool: { is_deleted: true, post_count: -42 }}
assert_equal(false, @pool.reload.is_deleted?)
assert_equal(0, @pool.post_count)
end
end
context "destroy action" do
setup do
@pool = FactoryGirl.create(:pool)
end
should "destroy a pool" do
post :destroy, {:id => @pool.id}, {:user_id => @mod.id}
delete_auth pool_path(@pool), @mod
@pool.reload
assert_equal(true, @pool.is_deleted?)
end
@@ -105,13 +93,14 @@ class PoolsControllerTest < ActionController::TestCase
context "undelete action" do
setup do
@pool = FactoryGirl.create(:pool)
@pool.is_deleted = true
@pool.save
as(@mod) do
@pool.is_deleted = true
@pool.save
end
end
should "restore a pool" do
post :undelete, {:id => @pool.id}, {:user_id => @mod.id}
post_auth undelete_pool_path(@pool), @mod
@pool.reload
assert_equal(false, @pool.is_deleted?)
end
@@ -119,28 +108,30 @@ class PoolsControllerTest < ActionController::TestCase
context "revert action" do
setup do
@post_2 = FactoryGirl.create(:post)
@pool = FactoryGirl.create(:pool, :post_ids => "#{@post.id}")
CurrentUser.ip_addr = "1.2.3.4" # this is to get around the version collation
@pool.update_attributes(:post_ids => "#{@post.id} #{@post_2.id}")
CurrentUser.ip_addr = "127.0.0.1"
as_user do
@post_2 = create(:post)
@pool = create(:pool, :post_ids => "#{@post.id}")
end
CurrentUser.scoped(@user, "1.2.3.4") do
@pool.update(:post_ids => "#{@post.id} #{@post_2.id}")
end
end
should "revert to a previous version" do
@pool.reload
version = @pool.versions.first
assert_equal([@post.id], version.post_ids)
post :revert, {:id => @pool.id, :version_id => version.id}, {:user_id => @mod.id}
put_auth revert_pool_path(@pool), @mod, params: {:version_id => version.id}
@pool.reload
assert_equal([@post.id], @pool.post_id_array)
end
should "not allow reverting to a previous version of another pool" do
@pool2 = FactoryGirl.create(:pool)
post :revert, { :id => @pool.id, :version_id => @pool2.versions.first.id }, {:user_id => @user.id}
as_user do
@pool2 = create(:pool)
end
put_auth revert_pool_path(@pool), @user, params: {:version_id => @pool2.versions.first.id }
@pool.reload
assert_not_equal(@pool.name, @pool2.name)
assert_response :missing
end