Merge branch '7986-user-account-closure-redirects' into develop

app/controllers/admin_users_account_anonymising_controller.rb

@@ -11,7 +11,7 @@ def create
       flash[:error] = 'Something went wrong. The user could not be anonymised.'
     end
 
-    redirect_to admin_user_path(@anonymised_user)
+    redirect_to edit_admin_user_path(@anonymised_user)
   end
 
   private

app/controllers/admin_users_account_closing_controller.rb

@@ -12,7 +12,7 @@ def create
         'Something went wrong. The user account could not be closed.'
     end
 
-    redirect_to admin_user_path(@closed_user)
+    redirect_to edit_admin_user_path(@closed_user)
   end
 
   private

doc/CHANGES.md

@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+* Improve redirection flow after user account closure actions (Gareth Rees)
 * Fix duplicated attachment masking jobs (Graeme Porteous)
 * Display metadata on admin attachment views (Graeme Porteous)
 * Change request URL patterns to be member routes (Alexander Griffen, Graeme

spec/controllers/admin_users_account_anonymising_controller_spec.rb

@@ -15,8 +15,8 @@
         expect(assigns[:anonymised_user]).to eq(user)
       end
 
-      it 'redirects to the user page' do
-        expect(response).to redirect_to(admin_user_path(user))
+      it 'redirects to the user edit page' do
+        expect(response).to redirect_to(edit_admin_user_path(user))
       end
 
       context 'on an open account' do

spec/controllers/admin_users_account_closing_controller_spec.rb

@@ -19,8 +19,8 @@
         expect(flash[:notice]).to eq('The user account was closed.')
       end
 
-      it 'redirects to the user page' do
-        expect(response).to redirect_to(admin_user_path(user))
+      it 'redirects to the user edit page' do
+        expect(response).to redirect_to(edit_admin_user_path(user))
       end
     end