diff options
Diffstat (limited to 'spec/features/groups')
11 files changed, 177 insertions, 56 deletions
diff --git a/spec/features/groups/clusters/applications_spec.rb b/spec/features/groups/clusters/applications_spec.rb deleted file mode 100644 index 324ef24efc4..00000000000 --- a/spec/features/groups/clusters/applications_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require_relative '../../../../spec/features/clusters/installing_applications_shared_examples' - -RSpec.describe 'Group-level Cluster Applications', :js do - include GoogleApi::CloudPlatformHelpers - - let(:group) { create(:group) } - let(:user) { create(:user) } - - before do - group.add_maintainer(user) - sign_in(user) - end - - describe 'Installing applications' do - include_examples "installing applications on a cluster" do - let(:cluster_path) { group_cluster_path(group, cluster) } - let(:cluster_factory_args) { [:group, groups: [group]] } - end - end -end diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb index 00ad1006037..161a8a7a203 100644 --- a/spec/features/groups/group_settings_spec.rb +++ b/spec/features/groups/group_settings_spec.rb @@ -153,6 +153,26 @@ RSpec.describe 'Edit group settings' do end end + describe 'prevent sharing outside group hierarchy setting' do + it 'updates the setting' do + visit edit_group_path(group) + + check 'group_prevent_sharing_groups_outside_hierarchy' + + expect { save_permissions_group }.to change { + group.reload.namespace_settings.prevent_sharing_groups_outside_hierarchy + }.to(true) + end + + it 'is not present for a subgroup' do + subgroup = create(:group, parent: group) + visit edit_group_path(subgroup) + + expect(page).to have_text "Permissions" + expect(page).not_to have_selector('#group_prevent_sharing_groups_outside_hierarchy') + end + end + def update_path(new_group_path) visit edit_group_path(group) diff --git a/spec/features/groups/import_export/connect_instance_spec.rb b/spec/features/groups/import_export/connect_instance_spec.rb index 73de49101ea..563c8f429f8 100644 --- a/spec/features/groups/import_export/connect_instance_spec.rb +++ b/spec/features/groups/import_export/connect_instance_spec.rb @@ -15,7 +15,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do visit new_group_path - find('#import-group-tab').click + click_link 'Import group' end context 'when the user provides valid credentials' do @@ -24,7 +24,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do pat = 'demo-pat' stub_path = 'stub-group' total = 37 - stub_request(:get, "%{url}/api/v4/groups?page=1&per_page=20&top_level_only=true&min_access_level=40&search=" % { url: source_url }).to_return( + stub_request(:get, "%{url}/api/v4/groups?page=1&per_page=20&top_level_only=true&min_access_level=50&search=" % { url: source_url }).to_return( body: [{ id: 2595438, web_url: 'https://gitlab.com/groups/auto-breakfast', diff --git a/spec/features/groups/import_export/import_file_spec.rb b/spec/features/groups/import_export/import_file_spec.rb index 7018f3b1086..08295a3392a 100644 --- a/spec/features/groups/import_export/import_file_spec.rb +++ b/spec/features/groups/import_export/import_file_spec.rb @@ -28,9 +28,9 @@ RSpec.describe 'Import/Export - Group Import', :js do group_name = 'Test Group Import' visit new_group_path + click_link 'Import group' - fill_in :group_name, with: group_name - find('#import-group-tab').click + fill_in :import_group_name, with: group_name expect(page).to have_content 'Import group from file' attach_file(file) do @@ -51,9 +51,9 @@ RSpec.describe 'Import/Export - Group Import', :js do context 'when modifying the pre-filled path' do it 'successfully imports the group' do visit new_group_path + click_link 'Import group' - fill_in :group_name, with: 'Test Group Import' - find('#import-group-tab').click + fill_in :import_group_name, with: 'Test Group Import' fill_in :import_group_path, with: 'custom-path' attach_file(file) do @@ -74,7 +74,7 @@ RSpec.describe 'Import/Export - Group Import', :js do it 'suggests a unique path' do visit new_group_path - find('#import-group-tab').click + click_link 'Import group' fill_in :import_group_path, with: 'test-group-import' expect(page).to have_content 'Group path is already taken. Suggestions: test-group-import1' @@ -87,9 +87,9 @@ RSpec.describe 'Import/Export - Group Import', :js do it 'displays an error' do visit new_group_path + click_link 'Import group' - fill_in :group_name, with: 'Test Group Import' - find('#import-group-tab').click + fill_in :import_group_name, with: 'Test Group Import' attach_file(file) do find('.js-filepicker-button').click end diff --git a/spec/features/groups/integrations/user_activates_mattermost_slash_command_spec.rb b/spec/features/groups/integrations/user_activates_mattermost_slash_command_spec.rb new file mode 100644 index 00000000000..7703268af39 --- /dev/null +++ b/spec/features/groups/integrations/user_activates_mattermost_slash_command_spec.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'User activates the group-level Mattermost Slash Command integration', :js do + include_context 'group integration activation' + + before do + stub_mattermost_setting(enabled: true) + visit_group_integration('Mattermost slash commands') + end + + let(:edit_path) { edit_group_settings_integration_path(group, :mattermost_slash_commands) } + + include_examples 'user activates the Mattermost Slash Command integration' +end diff --git a/spec/features/groups/members/manage_groups_spec.rb b/spec/features/groups/members/manage_groups_spec.rb index 40cd54c1e33..2dfcd941b4f 100644 --- a/spec/features/groups/members/manage_groups_spec.rb +++ b/spec/features/groups/members/manage_groups_spec.rb @@ -143,6 +143,82 @@ RSpec.describe 'Groups > Members > Manage groups', :js do end end + describe 'group search results' do + let_it_be(:group, refind: true) { create(:group) } + let_it_be(:group_within_hierarchy) { create(:group, parent: group) } + let_it_be(:group_outside_hierarchy) { create(:group) } + + before_all do + group.add_owner(user) + group_within_hierarchy.add_owner(user) + group_outside_hierarchy.add_owner(user) + end + + context 'when sharing with groups outside the hierarchy is enabled' do + context 'when the invite members group modal is disabled' do + before do + stub_feature_flags(invite_members_group_modal: false) + end + + it 'shows groups within and outside the hierarchy in search results' do + visit group_group_members_path(group) + + click_on 'Invite group' + click_on 'Search for a group' + + expect(page).to have_text group_within_hierarchy.name + expect(page).to have_text group_outside_hierarchy.name + end + end + + context 'when the invite members group modal is enabled' do + it 'shows groups within and outside the hierarchy in search results' do + visit group_group_members_path(group) + + click_on 'Invite a group' + click_on 'Select a group' + + expect(page).to have_text group_within_hierarchy.name + expect(page).to have_text group_outside_hierarchy.name + end + end + end + + context 'when sharing with groups outside the hierarchy is disabled' do + before do + group.namespace_settings.update!(prevent_sharing_groups_outside_hierarchy: true) + end + + context 'when the invite members group modal is disabled' do + before do + stub_feature_flags(invite_members_group_modal: false) + end + + it 'shows only groups within the hierarchy in search results' do + visit group_group_members_path(group) + + click_on 'Invite group' + click_on 'Search for a group' + + expect(page).to have_text group_within_hierarchy.name + expect(page).not_to have_text group_outside_hierarchy.name + end + end + + context 'when the invite members group modal is enabled' do + it 'shows only groups within the hierarchy in search results' do + visit group_group_members_path(group) + + click_on 'Invite a group' + click_on 'Select a group' + + expect(page).to have_text group_within_hierarchy.name + expect(page).not_to have_text group_outside_hierarchy.name + end + end + end + end + def add_group(id, role) page.click_link 'Invite group' page.within ".invite-group-form" do diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb index c5e6479ec51..ee18298e894 100644 --- a/spec/features/groups/members/manage_members_spec.rb +++ b/spec/features/groups/members/manage_members_spec.rb @@ -3,20 +3,19 @@ require 'spec_helper' RSpec.describe 'Groups > Members > Manage members' do - include Select2Helper include Spec::Support::Helpers::Features::MembersHelpers include Spec::Support::Helpers::Features::InviteMembersModalHelper - let(:user1) { create(:user, name: 'John Doe') } - let(:user2) { create(:user, name: 'Mary Jane') } - let(:group) { create(:group) } + let_it_be(:user1) { create(:user, name: 'John Doe') } + let_it_be(:user2) { create(:user, name: 'Mary Jane') } + let_it_be(:group) { create(:group) } before do sign_in(user1) end shared_examples 'includes the correct Invite link' do |should_include, should_not_include| - it 'includes either the form or the modal trigger' do + it 'includes either the form or the modal trigger', :aggregate_failures do group.add_owner(user1) visit group_group_members_path(group) @@ -27,12 +26,12 @@ RSpec.describe 'Groups > Members > Manage members' do end shared_examples 'does not include either invite modal or either invite form' do - it 'does not include either of the invite members or invite group modal buttons' do + it 'does not include either of the invite members or invite group modal buttons', :aggregate_failures do expect(page).not_to have_selector '.js-invite-members-modal' expect(page).not_to have_selector '.js-invite-group-modal' end - it 'does not include either of the invite users or invite group forms' do + it 'does not include either of the invite users or invite group forms', :aggregate_failures do expect(page).not_to have_selector '.invite-users-form' expect(page).not_to have_selector '.invite-group-form' end @@ -66,7 +65,7 @@ RSpec.describe 'Groups > Members > Manage members' do end end - it 'add user to group', :js do + it 'add user to group', :js, :snowplow, :aggregate_failures do group.add_owner(user1) visit group_group_members_path(group) @@ -77,6 +76,14 @@ RSpec.describe 'Groups > Members > Manage members' do expect(page).to have_content(user2.name) expect(page).to have_button('Reporter') end + + expect_snowplow_event( + category: 'Members::CreateService', + action: 'create_member', + label: 'group-members-page', + property: 'existing_user', + user: user1 + ) end it 'do not disclose email addresses', :js do @@ -143,11 +150,13 @@ RSpec.describe 'Groups > Members > Manage members' do wait_for_requests - expect(page).not_to have_content(user2.name) - expect(group.users).not_to include(user2) + aggregate_failures do + expect(page).not_to have_content(user2.name) + expect(group.users).not_to include(user2) + end end - it 'add yourself to group when already an owner', :js do + it 'add yourself to group when already an owner', :js, :aggregate_failures do group.add_owner(user1) visit group_group_members_path(group) @@ -160,7 +169,7 @@ RSpec.describe 'Groups > Members > Manage members' do end end - it 'invite user to group', :js do + it 'invite user to group', :js, :snowplow do group.add_owner(user1) visit group_group_members_path(group) @@ -170,14 +179,24 @@ RSpec.describe 'Groups > Members > Manage members' do expect(page).to have_link 'Invited' click_link 'Invited' - page.within(members_table) do - expect(page).to have_content('test@example.com') - expect(page).to have_content('Invited') - expect(page).to have_button('Reporter') + aggregate_failures do + page.within(members_table) do + expect(page).to have_content('test@example.com') + expect(page).to have_content('Invited') + expect(page).to have_button('Reporter') + end + + expect_snowplow_event( + category: 'Members::InviteService', + action: 'create_member', + label: 'group-members-page', + property: 'net_new_user', + user: user1 + ) end end - context 'as a guest', :js do + context 'when user is a guest' do before do group.add_guest(user1) group.add_developer(user2) @@ -187,7 +206,7 @@ RSpec.describe 'Groups > Members > Manage members' do it_behaves_like 'does not include either invite modal or either invite form' - it 'does not include a button on the members page list to manage or remove the existing member', :js do + it 'does not include a button on the members page list to manage or remove the existing member', :js, :aggregate_failures do page.within(second_row) do # Can not modify user2 role expect(page).not_to have_button 'Developer' @@ -198,7 +217,7 @@ RSpec.describe 'Groups > Members > Manage members' do end end - context 'As a guest when the :invite_members_group_modal feature flag is disabled', :js do + context 'when user is a guest and the :invite_members_group_modal feature flag is disabled' do before do stub_feature_flags(invite_members_group_modal: false) group.add_guest(user1) @@ -209,7 +228,7 @@ RSpec.describe 'Groups > Members > Manage members' do it_behaves_like 'does not include either invite modal or either invite form' - it 'does not include a button on the members page list to manage or remove the existing member', :js do + it 'does not include a button on the members page list to manage or remove the existing member', :js, :aggregate_failures do page.within(second_row) do # Can not modify user2 role expect(page).not_to have_button 'Developer' diff --git a/spec/features/groups/members/tabs_spec.rb b/spec/features/groups/members/tabs_spec.rb index 2f95e9fa6d3..2e9f332c0d6 100644 --- a/spec/features/groups/members/tabs_spec.rb +++ b/spec/features/groups/members/tabs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Tabs' do +RSpec.describe 'Groups > Members > Tabs', :js do using RSpec::Parameterized::TableSyntax shared_examples 'active "Members" tab' do @@ -56,7 +56,7 @@ RSpec.describe 'Groups > Members > Tabs' do it_behaves_like 'active "Members" tab' end - context 'when searching "Invited"', :js do + context 'when searching "Invited"' do before do visit group_group_members_path(group) @@ -86,7 +86,7 @@ RSpec.describe 'Groups > Members > Tabs' do end end - context 'when using "Invited" pagination', :js do + context 'when using "Invited" pagination' do before do visit group_group_members_path(group) diff --git a/spec/features/groups/milestones/gfm_autocomplete_spec.rb b/spec/features/groups/milestones/gfm_autocomplete_spec.rb index 85a14123294..1fec6091f1e 100644 --- a/spec/features/groups/milestones/gfm_autocomplete_spec.rb +++ b/spec/features/groups/milestones/gfm_autocomplete_spec.rb @@ -16,6 +16,7 @@ RSpec.describe 'GFM autocomplete', :js do fill_in 'Description', with: User.reference_prefix wait_for_requests expect(find_autocomplete_menu).to be_visible + expect_autocomplete_entry(user.name) expect_autocomplete_entry(group.name) fill_in 'Description', with: Label.reference_prefix diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb index b46d4dae87a..70a19445c89 100644 --- a/spec/features/groups/navbar_spec.rb +++ b/spec/features/groups/navbar_spec.rb @@ -13,6 +13,7 @@ RSpec.describe 'Group navbar' do let(:structure) do [ + group_context_nav_item, group_information_nav_item, { nav_item: _('Issues'), @@ -37,6 +38,13 @@ RSpec.describe 'Group navbar' do nil end + let(:group_context_nav_item) do + { + nav_item: "#{group.name[0, 1].upcase} #{group.name}", + nav_sub_items: [] + } + end + before do insert_package_nav(_('Kubernetes')) @@ -79,6 +87,10 @@ RSpec.describe 'Group navbar' do end context 'when feature flag :sidebar_refactor is disabled' do + let(:group_context_nav_item) do + nil + end + let(:group_information_nav_item) do { nav_item: _('Group overview'), diff --git a/spec/features/groups/settings/user_searches_in_settings_spec.rb b/spec/features/groups/settings/user_searches_in_settings_spec.rb index 6d7a3871bb1..a01514714dd 100644 --- a/spec/features/groups/settings/user_searches_in_settings_spec.rb +++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb @@ -24,7 +24,7 @@ RSpec.describe 'User searches group settings', :js do visit group_settings_integrations_path(group) end - it_behaves_like 'can highlight results', 'set default configuration' + it_behaves_like 'can highlight results', 'Project integration management' end context 'in Repository page' do |