Merge pull request #2504 from alphagov/use-assert-not-authorised-to-d…

…ry-up-assertions Use TestHelper#assert_not_authorised to DRY up tests
alphagov · Nov 9, 2023 · e2e88de · e2e88de
2 parents 848c9cb + 71d6cda
commit e2e88de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/test/controllers/invitations_controller_test.rb b/test/controllers/invitations_controller_test.rb
@@ -135,7 +135,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         get :new
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -147,7 +147,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         get :new
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -159,7 +159,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         get :new
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -452,7 +452,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :create, params: { user: { name: "invitee", email: "invitee@gov.uk" } }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -464,7 +464,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :create, params: { user: { name: "org-admin-invitee", email: "org-admin-invitee@gov.uk" } }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -476,7 +476,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :create, params: { user: { name: "super-org-admin-invitee", email: "super-org-admin-invitee@gov.uk" } }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -516,7 +516,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :resend, params: { id: @user_to_resend_for }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -528,7 +528,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :resend, params: { id: @user_to_resend_for }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 
@@ -540,7 +540,7 @@ class InvitationsControllerTest < ActionController::TestCase
       should "disallow access" do
         post :resend, params: { id: @user_to_resend_for }
 
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
 

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
@@ -243,7 +243,7 @@ class UsersControllerTest < ActionController::TestCase
 
       should "disallow access" do
         get :index
-        assert_redirected_to root_path
+        assert_not_authorised
       end
     end
   end
@@ -303,8 +303,7 @@ class UsersControllerTest < ActionController::TestCase
 
         get :edit, params: { id: superadmin.id }
 
-        assert_redirected_to root_path
-        assert_match(/You do not have permission to perform this action./, flash[:alert])
+        assert_not_authorised
       end
 
       should "can give permissions to all applications" do
@@ -579,8 +578,7 @@ class UsersControllerTest < ActionController::TestCase
 
           get :edit, params: { id: another_user }
 
-          assert_redirected_to root_path
-          assert_equal "You do not have permission to perform this action.", flash[:alert]
+          assert_not_authorised
         end
       end
     end
@@ -598,8 +596,7 @@ class UsersControllerTest < ActionController::TestCase
 
         put :edit, params: { id: superadmin.id, user: { email: "normal_user@example.com" } }
 
-        assert_redirected_to root_path
-        assert_match(/You do not have permission to perform this action./, flash[:alert])
+        assert_not_authorised
       end
 
       should "update the user's organisation" do
@@ -736,8 +733,7 @@ class UsersControllerTest < ActionController::TestCase
 
         put :update, params: { id: user.id, user: { organisation_id: @organisation_admin.organisation.id } }
 
-        assert_redirected_to root_path
-        assert_match(/You do not have permission to perform this action./, flash[:alert])
+        assert_not_authorised
       end
 
       should "redisplay the form if save fails" do