Merge pull request #2910 from alphagov/1191-fix-current-role

Fix current role on edit role pages
alphagov · May 29, 2024 · 57dc842 · 57dc842
2 parents bbe04d0 + 1c739df
commit 57dc842
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/app/views/account/roles/edit.html.erb b/app/views/account/roles/edit.html.erb
@@ -24,7 +24,7 @@
             id: "user_role",
             name: "user[role]",
             label: "Role",
-            options: current_user.manageable_roles.map { |role| { text: role.display_name, value: role.name, selected: current_user.role == role.name } }
+            options: current_user.manageable_roles.map { |role| { text: role.display_name, value: role.name, selected: current_user.role_name == role.name } }
             } %>
         <%= render "govuk_publishing_components/components/button", {
           text: "Change role"

diff --git a/app/views/users/roles/edit.html.erb b/app/views/users/roles/edit.html.erb
@@ -48,7 +48,7 @@
           name: "user[role]",
           label: "Role",
           hint: user_role_select_hint,
-          options: current_user.manageable_roles.map { |role| { text: role.display_name, value: role.name, selected: @user.role == role.name } },
+          options: current_user.manageable_roles.map { |role| { text: role.display_name, value: role.name, selected: @user.role_name == role.name } },
           error_message: @user.errors[:role].any? ? @user.errors.full_messages_for(:role).to_sentence : nil
         } %>
         <div class="govuk-button-group">

diff --git a/test/integration/account_roles_test.rb b/test/integration/account_roles_test.rb
@@ -21,6 +21,7 @@ class AccountRolesTest < ActionDispatch::IntegrationTest
 
       visit edit_account_role_path
 
+      assert has_select? "Role", selected: "Superadmin"
       select "Normal", from: "Role"
       click_button "Change role"
 

diff --git a/test/integration/change_user_role_test.rb b/test/integration/change_user_role_test.rb
@@ -14,10 +14,11 @@ def sign_in_as_and_edit_user(sign_in_as, user_to_edit)
 
   context "when logged in as a super admin" do
     should "be able to change the role of a user who is not exempt from 2SV" do
-      user = create(:user)
+      user = create(:two_step_enabled_organisation_admin)
       sign_in_as_and_edit_user(@super_admin, user)
       click_link "Change Role"
 
+      assert has_select? "Role", selected: "Organisation admin"
       select "Admin", from: "Role"
       click_button "Change role"