diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/support/shared_examples/features | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/support/shared_examples/features')
4 files changed, 49 insertions, 3 deletions
diff --git a/spec/support/shared_examples/features/discussion_comments_shared_example.rb b/spec/support/shared_examples/features/discussion_comments_shared_example.rb index 808e0be6be2..ff2878f77b4 100644 --- a/spec/support/shared_examples/features/discussion_comments_shared_example.rb +++ b/spec/support/shared_examples/features/discussion_comments_shared_example.rb @@ -11,6 +11,8 @@ RSpec.shared_examples 'thread comments for commit and snippet' do |resource_name let(:comment) { 'My comment' } it 'clicking "Comment" will post a comment' do + wait_for_all_requests + expect(page).to have_selector toggle_selector find("#{form_selector} .note-textarea").send_keys(comment) @@ -29,6 +31,8 @@ RSpec.shared_examples 'thread comments for commit and snippet' do |resource_name find("#{form_selector} .note-textarea").send_keys(comment) find(toggle_selector).click + + wait_for_all_requests end it 'has a "Comment" item (selected by default) and "Start thread" item' do diff --git a/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb new file mode 100644 index 00000000000..cfa043322db --- /dev/null +++ b/spec/support/shared_examples/features/integrations/user_activates_mattermost_slash_command_integration_shared_examples.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'user activates the Mattermost Slash Command integration' do + it 'shows a help message' do + expect(page).to have_content('Use this service to perform common') + end + + it 'shows a token placeholder' do + token_placeholder = find_field('service_token')['placeholder'] + + expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx') + end + + it 'redirects to the integrations page after saving but not activating' do + token = ('a'..'z').to_a.join + + fill_in 'service_token', with: token + click_active_checkbox + click_save_integration + + expect(current_path).to eq(edit_path) + expect(page).to have_content('Mattermost slash commands settings saved, but not active.') + end + + it 'redirects to the integrations page after activating' do + token = ('a'..'z').to_a.join + + fill_in 'service_token', with: token + click_save_integration + + expect(current_path).to eq(edit_path) + expect(page).to have_content('Mattermost slash commands settings saved and active.') + end +end diff --git a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb index 736c353c2aa..c0cfc27ceaf 100644 --- a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb +++ b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb @@ -1,9 +1,12 @@ # frozen_string_literal: true -RSpec.shared_examples 'issuable invite members experiments' do +RSpec.shared_examples 'issuable invite members' do context 'when a privileged user can invite' do - it 'shows a link for inviting members and launches invite modal' do + before do project.add_maintainer(user) + end + + it 'shows a link for inviting members and launches invite modal' do visit issuable_path find('.block.assignee .edit-link').click @@ -23,8 +26,11 @@ RSpec.shared_examples 'issuable invite members experiments' do end context 'when user cannot invite members in assignee dropdown' do - it 'shows author in assignee dropdown and no invite link' do + before do project.add_developer(user) + end + + it 'shows author in assignee dropdown and no invite link' do visit issuable_path find('.block.assignee .edit-link').click diff --git a/spec/support/shared_examples/features/variable_list_shared_examples.rb b/spec/support/shared_examples/features/variable_list_shared_examples.rb index 4b94411f009..997500415a9 100644 --- a/spec/support/shared_examples/features/variable_list_shared_examples.rb +++ b/spec/support/shared_examples/features/variable_list_shared_examples.rb @@ -283,6 +283,8 @@ RSpec.shared_examples 'variable list' do end def fill_variable(key, value, protected: false, masked: false) + wait_for_requests + page.within('#add-ci-variable') do find('[data-qa-selector="ci_variable_key_field"] input').set(key) find('[data-qa-selector="ci_variable_value_field"]').set(value) if value.present? |