Commit 6bfffffc authored by Savas Vedova's avatar Savas Vedova

Merge branch '301014-all-labels-and-text-in-invite-members-modal-should-be-reviewed' into 'master'

Change labels and help text for invite members modal [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!56967
parents eb999a05 fade6abf
...@@ -222,9 +222,9 @@ export default { ...@@ -222,9 +222,9 @@ export default {
}, },
labels: { labels: {
members: { members: {
modalTitle: s__('InviteMembersModal|Invite team members'), modalTitle: s__('InviteMembersModal|Invite members'),
searchField: s__('InviteMembersModal|GitLab member or Email address'), searchField: s__('InviteMembersModal|GitLab member or email address'),
placeHolder: s__('InviteMembersModal|Search for members to invite'), placeHolder: s__('InviteMembersModal|Select members or type email addresses'),
toGroup: { toGroup: {
introText: s__( introText: s__(
"InviteMembersModal|You're inviting members to the %{strongStart}%{name}%{strongEnd} group.", "InviteMembersModal|You're inviting members to the %{strongStart}%{name}%{strongEnd} group.",
......
...@@ -16888,7 +16888,7 @@ msgstr "" ...@@ -16888,7 +16888,7 @@ msgstr ""
msgid "InviteMembersModal|Close invite team members" msgid "InviteMembersModal|Close invite team members"
msgstr "" msgstr ""
msgid "InviteMembersModal|GitLab member or Email address" msgid "InviteMembersModal|GitLab member or email address"
msgstr "" msgstr ""
msgid "InviteMembersModal|Invite" msgid "InviteMembersModal|Invite"
...@@ -16897,7 +16897,7 @@ msgstr "" ...@@ -16897,7 +16897,7 @@ msgstr ""
msgid "InviteMembersModal|Invite a group" msgid "InviteMembersModal|Invite a group"
msgstr "" msgstr ""
msgid "InviteMembersModal|Invite team members" msgid "InviteMembersModal|Invite members"
msgstr "" msgstr ""
msgid "InviteMembersModal|Members were successfully added" msgid "InviteMembersModal|Members were successfully added"
...@@ -16906,10 +16906,10 @@ msgstr "" ...@@ -16906,10 +16906,10 @@ msgstr ""
msgid "InviteMembersModal|Search for a group to invite" msgid "InviteMembersModal|Search for a group to invite"
msgstr "" msgstr ""
msgid "InviteMembersModal|Search for members to invite" msgid "InviteMembersModal|Select a group to invite"
msgstr "" msgstr ""
msgid "InviteMembersModal|Select a group to invite" msgid "InviteMembersModal|Select members or type email addresses"
msgstr "" msgstr ""
msgid "InviteMembersModal|Some of the members could not be added" msgid "InviteMembersModal|Some of the members could not be added"
......
...@@ -42,7 +42,7 @@ module QA ...@@ -42,7 +42,7 @@ module QA
within_element(:invite_members_modal_content) do within_element(:invite_members_modal_content) do
fill_element :access_level_dropdown, with: access_level fill_element :access_level_dropdown, with: access_level
fill_in 'Search for members to invite', with: username fill_in 'Select members or type email addresses', with: username
Support::WaitForRequests.wait_for_requests Support::WaitForRequests.wait_for_requests
......
...@@ -175,7 +175,7 @@ RSpec.describe 'Project members list', :js do ...@@ -175,7 +175,7 @@ RSpec.describe 'Project members list', :js do
click_on 'Invite members' click_on 'Invite members'
page.within '#invite-members-modal' do page.within '#invite-members-modal' do
fill_in 'Search for members to invite', with: id fill_in 'Select members or type email addresses', with: id
wait_for_requests wait_for_requests
click_button id click_button id
......
...@@ -93,7 +93,7 @@ describe('InviteMembersModal', () => { ...@@ -93,7 +93,7 @@ describe('InviteMembersModal', () => {
}); });
it('renders the modal with the correct title', () => { it('renders the modal with the correct title', () => {
expect(wrapper.findComponent(GlModal).props('title')).toBe('Invite team members'); expect(wrapper.findComponent(GlModal).props('title')).toBe('Invite members');
}); });
it('renders the Cancel button text correctly', () => { it('renders the Cancel button text correctly', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment