Merge pull request #2011 from alphagov/bug-validation-error-assigning…

…-reviewer

Bug fix for claiming 2i on scheduled publication

app/controllers/editions_controller.rb

@@ -176,7 +176,7 @@ def review
     end
 
     resource.reviewer = params[:edition][:reviewer]
-    if resource.save!
+    if resource.save
       flash[:success] = "You are the reviewer of this #{description(resource).downcase}."
     else
       flash[:danger] = "Something went wrong when attempting to claim 2i."

test/functional/editions_controller_test.rb

@@ -877,6 +877,20 @@ class EditionsControllerTest < ActionController::TestCase
       assert_equal bob.name, @guide.reviewer
     end
 
+    should "not be able to update the reviewer when edition is scheduled for publishing" do
+      bob = FactoryBot.create(:user, name: "bob")
+      edition = FactoryBot.create(:edition, :scheduled_for_publishing)
+
+      put :review,
+          params: {
+            id: edition.id,
+            edition: { reviewer: bob.name },
+          }
+
+      assert_response(302)
+      assert_equal "Something went wrong when attempting to claim 2i.", flash[:danger]
+    end
+
     context "Welsh editors" do
       setup do
         @welsh_guide = FactoryBot.create(:guide_edition, :welsh, :in_review)