From 7d07eb0a2aa4c5e0a89093b60c7db703bf8b1b86 Mon Sep 17 00:00:00 2001
From: Ben <benbaumann95@hotmail.co.uk>
Date: Tue, 28 Jul 2020 16:25:35 +0100
Subject: [PATCH] Fix Rails/Savebang rubocop related failures - Update method
 name 'update' to 'call' - Fix test with weak password that wasn't previously
 being persisted correctly - Rescue from ActiveRecord::RecordInvalid to keep
 user flow consistent after adding ! to `save` in 'suspend' and 'unsuspend'
 methods

---
 app/controllers/suspensions_controller.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/suspensions_controller.rb b/app/controllers/suspensions_controller.rb
index 352341a19..ca2035ea2 100644
--- a/app/controllers/suspensions_controller.rb
+++ b/app/controllers/suspensions_controller.rb
@@ -2,6 +2,8 @@ class SuspensionsController < ApplicationController
   before_action :authenticate_user!, :load_and_authorize_user
   respond_to :html
 
+  rescue_from ActiveRecord::RecordInvalid, with: :render_edit
+
   def update
     if params[:user][:suspended] == "1"
       succeeded = @user.suspend(params[:user][:reason_for_suspension])
@@ -20,8 +22,7 @@ def update
 
       redirect_to @user.api_user? ? edit_api_user_path(@user) : edit_user_path(@user)
     else
-      flash[:alert] = "Failed"
-      render :edit
+      render_edit
     end
   end
 
@@ -31,4 +32,9 @@ def load_and_authorize_user
     @user = User.find(params[:id])
     authorize @user, :suspension?
   end
+
+  def render_edit
+    flash[:alert] = "Failed"
+    render :edit
+  end
 end