diff --git a/app/controllers/moderation_reports_controller.rb b/app/controllers/moderation_reports_controller.rb index 4345457c7..44830e81c 100644 --- a/app/controllers/moderation_reports_controller.rb +++ b/app/controllers/moderation_reports_controller.rb @@ -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 diff --git a/test/functional/moderation_reports_controller_test.rb b/test/functional/moderation_reports_controller_test.rb index 35341a579..b4491a969 100644 --- a/test/functional/moderation_reports_controller_test.rb +++ b/test/functional/moderation_reports_controller_test.rb @@ -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