From be585060f4232049fff90a81c2217ffe1fc61b0a Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 10 Mar 2020 21:02:12 -0500 Subject: [PATCH] BURs: don't add [APPROVED] / [REJECTED] tags to titles. --- app/logical/forum_updater.rb | 12 ++---------- app/models/bulk_update_request.rb | 12 ++++-------- test/unit/bulk_update_request_test.rb | 9 ++------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/app/logical/forum_updater.rb b/app/logical/forum_updater.rb index eeea0652d..b5d7bcd5b 100644 --- a/app/logical/forum_updater.rb +++ b/app/logical/forum_updater.rb @@ -1,18 +1,16 @@ class ForumUpdater - attr_reader :forum_topic, :forum_post, :expected_title + attr_reader :forum_topic, :forum_post def initialize(forum_topic, options = {}) @forum_topic = forum_topic @forum_post = options[:forum_post] - @expected_title = options[:expected_title] end - def update(message, title_tag = nil) + def update(message) return if forum_topic.nil? CurrentUser.scoped(User.system) do create_response(message) - update_title(title_tag) if title_tag if forum_post update_post(message) @@ -24,12 +22,6 @@ class ForumUpdater forum_topic.posts.create(body: body, skip_mention_notifications: true, creator: User.system) end - def update_title(title_tag) - if forum_topic.title == expected_title - forum_topic.update(:title => "[#{title_tag}] #{forum_topic.title}") - end - end - def update_post(body) forum_post.update(body: "#{forum_post.body}\n\nEDIT: #{body}", skip_mention_notifications: true) end diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index ed8f30e0e..791d8fff1 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -64,11 +64,7 @@ class BulkUpdateRequest < ApplicationRecord else nil end - ForumUpdater.new( - forum_topic, - forum_post: post, - expected_title: title - ) + ForumUpdater.new(forum_topic, forum_post: post) end end @@ -77,13 +73,13 @@ class BulkUpdateRequest < ApplicationRecord CurrentUser.scoped(approver) do AliasAndImplicationImporter.new(script, forum_topic_id, "1", true).process! update!(status: "approved", approver: approver, skip_secondary_validations: true) - forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has been approved by @#{approver.name}.", "APPROVED") + forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has been approved by @#{approver.name}.") end end rescue AliasAndImplicationImporter::Error => x self.approver = approver CurrentUser.scoped(approver) do - forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has failed: #{x}", "FAILED") + forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has failed: #{x}") end end @@ -98,7 +94,7 @@ class BulkUpdateRequest < ApplicationRecord def reject!(rejector = User.system) transaction do update(status: "rejected") - forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has been rejected by @#{rejector.name}.", "REJECTED") + forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post.id}) has been rejected by @#{rejector.name}.") end end diff --git a/test/unit/bulk_update_request_test.rb b/test/unit/bulk_update_request_test.rb index 8077e140d..9c6d780b9 100644 --- a/test/unit/bulk_update_request_test.rb +++ b/test/unit/bulk_update_request_test.rb @@ -164,7 +164,6 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase end assert_equal("pending", @req.reload.status) - assert_match(/\[FAILED\]/, @topic.reload.title) end should "leave the BUR pending if there is an unexpected error during approval" do @@ -188,9 +187,7 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase @req.approve!(@admin) end - @topic.reload - @post.reload - assert_match(/\[APPROVED\]/, @topic.title) + assert_match(/approved/, @post.reload.body) end should "update the topic when rejected" do @@ -200,9 +197,7 @@ class BulkUpdateRequestTest < ActiveSupport::TestCase @req.reject!(@admin) end - @topic.reload - @post.reload - assert_match(/\[REJECTED\]/, @topic.title) + assert_match(/rejected/, @post.reload.body) end should "reference the rejector in the automated message" do