Merge pull request #13661 from opf/bug/49989-harmonize-casing-and-plu…

…ralization-of-global-permissions

[#49989] Harmonize casing/pluralization of global permissions

config/locales/en.yml

@@ -2191,8 +2191,8 @@ en:
     zero: "no projects"
   label_yesterday: "yesterday"
   label_role_type: "Type"
-  label_member_role: "Project Role"
-  label_global_role: "Global Role"
+  label_member_role: "Project role"
+  label_global_role: "Global role"
   label_not_changeable: "(not changeable)"
   label_global: "Global"
   label_seeded_from_env_warning: This record has been created through a setting / environment variable. It is not editable through UI.
@@ -2437,7 +2437,7 @@ en:
   permission_add_work_package_notes: "Add notes"
   permission_add_work_packages: "Add work packages"
   permission_add_messages: "Post messages"
-  permission_add_project: "Create project"
+  permission_add_project: "Create projects"
   permission_archive_project: "Archive project"
   permission_create_user: "Create users"
   permission_manage_user: "Edit users"
@@ -2450,7 +2450,7 @@ en:
   permission_comment_news: "Comment news"
   permission_commit_access: "Read/write access to repository (commit)"
   permission_copy_projects: "Copy projects"
-  permission_create_backup: "Create backup"
+  permission_create_backup: "Create backups"
   permission_delete_work_package_watchers: "Delete watchers"
   permission_delete_work_packages: "Delete work packages"
   permission_delete_messages: "Delete messages"

config/locales/js-en.yml

@@ -461,7 +461,7 @@ en:
     label_filename: "File"
     label_filesize: "Size"
     label_general: "General"
-    label_global_roles: "Global Roles"
+    label_global_roles: "Global roles"
     label_greater_or_equal: ">="
     label_group: 'Group'
     label_group_by: "Group by"

spec/features/global_roles/global_create_project_spec.rb

@@ -31,18 +31,17 @@
 RSpec.describe 'Global role: Global Create project',
                js: true,
                with_cuprite: true do
-  let(:user) { create(:admin) }
-  let(:project) { create(:project) }
+  shared_let(:admin) { create(:admin) }
+  shared_let(:user) { create(:user) }
+  shared_let(:project) { create(:project) }
 
-  before do
-    login_as user
-  end
-
-  describe 'Create Project is not a member permission' do
+  describe 'Create project is not a member permission' do
     # Given there is a role "Member"
     let!(:role) { create(:role, name: 'Member') }
 
     # And I am already admin
+    current_user { admin }
+
     # When I go to the edit page of the role "Member"
     # Then I should not see "Create project"
     it 'does not show the global permission' do
@@ -52,10 +51,13 @@
     end
   end
 
-  describe 'Create Project is a global permission' do
+  describe 'Create project is a global permission' do
     # Given there is a global role "Global"
     let!(:role) { create(:global_role, name: 'Global') }
+
     # And I am already admin
+    current_user { admin }
+
     # When I go to the edit page of the role "Global"
     # Then I should see "Create project"
 
@@ -66,11 +68,10 @@
     end
   end
 
-  describe 'Create Project displayed to user' do
+  describe 'Create project displayed to user' do
     let!(:global_role) { create(:global_role, name: 'Global', permissions: %i[add_project]) }
     let!(:member_role) { create(:role, name: 'Member', permissions: %i[view_project]) }
 
-    let(:user) { create(:user) }
     let!(:global_member) do
       create(:global_member,
              principal: user,
@@ -79,6 +80,8 @@
 
     let(:name_field) { FormFields::InputFormField.new :name }
 
+    current_user { user }
+
     it 'does show the global permission' do
       visit projects_path
       expect(page).to have_selector('.button.-alt-highlight', text: 'Project')
@@ -94,13 +97,14 @@
     end
   end
 
-  describe 'Create Project not displayed to user without global role' do
+  describe 'Create project not displayed to user without global role' do
     # Given there is 1 User with:
     # | Login | bob |
     # | Firstname | Bob |
     # | Lastname | Bobbit |
     #   When I am already logged in as "bob"
-    let(:user) { create(:user) }
+
+    current_user { user }
 
     it 'does show the global permission' do
       # And I go to the overall projects page

spec/features/global_roles/global_role_assignment_spec.rb

@@ -54,7 +54,7 @@
 
     it 'allows global roles management' do
       visit edit_user_path user
-      click_link 'Global Roles'
+      click_link 'Global roles'
 
       page.within('#table_principal_roles') do
         expect(page).to have_text 'global_role1'

spec/features/global_roles/global_role_crud_spec.rb

@@ -47,8 +47,8 @@
     visit new_role_path
     # Then I should not see block with "#global_permissions"
     expect(page).not_to have_selector('.form--fieldset-legend', text: 'GLOBAL')
-    # When I check "Global Role"
-    check 'Global Role'
+    # When I check "Global role"
+    check 'Global role'
     # Then I should see block with "#global_permissions"
     expect(page).to have_selector('.form--fieldset-legend', text: 'GLOBAL')
     # And I should see "Global group"