Allow to remove suspended role (forem#20439)

* Allow to remove suspended role * Fixed the cypress spec for removing suspended role
forksrc · Dec 12, 2023 · e0ba90d · e0ba90d
1 parent 9eaa196
commit e0ba90d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/app/policies/role_policy.rb b/app/policies/role_policy.rb
@@ -1,7 +1,5 @@
 class RolePolicy < ApplicationPolicy
   def remove_role?
-    return false if record.suspended?
-
     if user.super_admin?
       true
     else

diff --git a/cypress/e2e/seededFlows/adminFlows/users/manageRoles.spec.js b/cypress/e2e/seededFlows/adminFlows/users/manageRoles.spec.js
@@ -74,7 +74,7 @@ describe('Manage User Roles', () => {
         verifyAndDismissFlashMessage('User has been updated', 'flash-success');
 
         cy.findByRole('button', {
-          name: "Suspended You can't remove this role.",
+          name: 'Remove role: Suspended',
         }).should('exist');
         checkUserStatus('Suspended');
 

diff --git a/spec/policies/role_policy_spec.rb b/spec/policies/role_policy_spec.rb
@@ -10,8 +10,8 @@
   let(:admin_user) { build(:user, :admin) }
 
   permissions :remove_role? do
-    it "denies access if current role is suspended" do
-      expect(role).not_to permit(super_admin_user, role_suspended)
+    it "allows access for super_admin if the role is suspended" do
+      expect(role).to permit(super_admin_user, role_suspended)
     end
 
     it "grants access if user is super admin" do