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

Fix #4278: Certain users are unable to use the report function.

Browse Source
This commit is contained in:
evazion
2020-01-30 12:35:05 -06:00
parent d29b88d43b
commit e715bfad8a
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/moderation_reports_controller.rb
View File

@@ -1,6 +1,6 @@
class ModerationReportsController < ApplicationController
respond_to :html, :xml, :json, :js
before_action :builder_only, only: [:new, :create]
before_action :member_only, only: [:new, :create]
before_action :moderator_only, only: [:index]
def new

33
test/functional/moderation_reports_controller_test.rb
View File

@@ -3,37 +3,35 @@ require 'test_helper'
class ModerationReportsControllerTest < ActionDispatch::IntegrationTest
context "The moderation reports controller" do
setup do
travel_to(2.weeks.ago) do
@user = create(:user)
@builder = create(:builder_user)
@mod = create(:moderator_user)
end
@user = create(:user, created_at: 2.weeks.ago)
@spammer = create(:user, created_at: 2.weeks.ago)
@mod = create(:moderator_user, created_at: 2.weeks.ago)
@user.as_current do
@comment = create(:comment, creator: @user)
@spammer.as_current do
@comment = create(:comment, creator: @spammer)
end
end
context "new action" do
should "render the access denied page" do
get_auth new_moderation_report_path, @user
get_auth new_moderation_report_path, User.anonymous
assert_response 403
assert_select "h1", /Access Denied/
end
should "render" do
get_auth new_moderation_report_path, @mod, params: {:moderation_report => {:model_id => @comment.id, :model_type => "Comment"}}
get_auth new_moderation_report_path, @user, params: {:moderation_report => {:model_id => @comment.id, :model_type => "Comment"}}
assert_response :success
end
end
context "index action" do
setup do
create(:moderation_report, model: @comment, creator: @builder)
create(:moderation_report, model: @comment, creator: @user)
end
should "render the access denied page" do
get_auth moderation_reports_path, @builder
get_auth moderation_reports_path, @user
assert_response 403
assert_select "h1", /Access Denied/
end
@@ -49,14 +47,13 @@ class ModerationReportsControllerTest < ActionDispatch::IntegrationTest
assert_response :success
end
end
end
context "create action" do
should "create a new moderation report" do
assert_difference("ModerationReport.count", 1) do
assert_difference("ModerationReport.count") do
post_auth moderation_reports_path, @builder, params: {:format => "js", :moderation_report => {:model_id => @comment.id, :model_type => "Comment", :reason => "xxx"}}
end
end
context "create action" do
should "create a new moderation report" do
assert_difference("ModerationReport.count", 1) do
post_auth moderation_reports_path, @user, params: {:format => "js", :moderation_report => {:model_id => @comment.id, :model_type => "Comment", :reason => "xxx"}}
assert_response :success
end
end
end