diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /spec/features/groups | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
download | gitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'spec/features/groups')
-rw-r--r-- | spec/features/groups/board_sidebar_spec.rb | 26 | ||||
-rw-r--r-- | spec/features/groups/issues_spec.rb | 39 | ||||
-rw-r--r-- | spec/features/groups/members/request_access_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/packages_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/groups/settings/packages_and_registries_spec.rb | 5 | ||||
-rw-r--r-- | spec/features/groups/settings/repository_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/groups/show_spec.rb | 167 |
7 files changed, 126 insertions, 123 deletions
diff --git a/spec/features/groups/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb index e2dd2fecab7..69a6788e438 100644 --- a/spec/features/groups/board_sidebar_spec.rb +++ b/spec/features/groups/board_sidebar_spec.rb @@ -42,30 +42,4 @@ RSpec.describe 'Group Issue Boards', :js do end end end - - context 'when graphql_board_lists FF disabled' do - before do - stub_feature_flags(graphql_board_lists: false) - sign_in(user) - - visit group_board_path(group, board) - wait_for_requests - end - - it 'only shows valid labels for the issue project and group' do - click_card(card) - - page.within('.labels') do - click_link 'Edit' - - wait_for_requests - - page.within('.selectbox') do - expect(page).to have_content(project_1_label.title) - expect(page).to have_content(group_label.title) - expect(page).not_to have_content(project_2_label.title) - end - end - end - end end diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index 21b39d2da46..489beb70ab3 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -33,7 +33,7 @@ RSpec.describe 'Group issues page' do # However,`:js` option forces Capybara to use Selenium that doesn't support`:has` context "it has an RSS button with current_user's feed token" do it "shows the RSS button with current_user's feed token" do - expect(find('[data-testid="rss-feed-link"]')['href']).to have_content(user.feed_token) + expect(page).to have_link 'Subscribe to RSS feed', href: /feed_token=#{user.feed_token}/ end end end @@ -46,7 +46,7 @@ RSpec.describe 'Group issues page' do # Note: please see the above context "it has an RSS button without a feed token" do it "shows the RSS button without a feed token" do - expect(find('[data-testid="rss-feed-link"]')['href']).not_to have_content('feed_token') + expect(page).not_to have_link 'Subscribe to RSS feed', href: /feed_token/ end end end @@ -94,6 +94,41 @@ RSpec.describe 'Group issues page' do expect(page).not_to have_content issue.title[0..80] end end + + context 'when cached issues state count is enabled', :clean_gitlab_redis_cache do + before do + stub_feature_flags(cached_issues_state_count: true) + end + + it 'truncates issue counts if over the threshold' do + allow(Rails.cache).to receive(:read).and_call_original + allow(Rails.cache).to receive(:read).with( + ['group', group.id, 'issues'], + { expires_in: Gitlab::IssuablesCountForState::CACHE_EXPIRES_IN } + ).and_return({ opened: 1050, closed: 500, all: 1550 }) + + visit issues_group_path(group) + + expect(page).to have_text('Open 1.1k Closed 500 All 1.6k') + end + end + + context 'when cached issues state count is disabled', :clean_gitlab_redis_cache do + before do + stub_feature_flags(cached_issues_state_count: false) + end + + it 'does not truncate counts if they are over the threshold' do + allow_next_instance_of(IssuesFinder) do |finder| + allow(finder).to receive(:count_by_state).and_return(true) + .and_return({ opened: 1050, closed: 500, all: 1550 }) + end + + visit issues_group_path(group) + + expect(page).to have_text('Open 1,050 Closed 500 All 1,550') + end + end end context 'projects with issues disabled' do diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb index 827962fee61..f806c7d3704 100644 --- a/spec/features/groups/members/request_access_spec.rb +++ b/spec/features/groups/members/request_access_spec.rb @@ -24,7 +24,7 @@ RSpec.describe 'Groups > Members > Request access' do it 'user can request access to a group' do perform_enqueued_jobs { click_link 'Request Access' } - expect(ActionMailer::Base.deliveries.last.to).to eq [owner.notification_email] + expect(ActionMailer::Base.deliveries.last.to).to eq [owner.notification_email_or_default] expect(ActionMailer::Base.deliveries.last.subject).to match "Request to join the #{group.name} group" expect(group.requesters.exists?(user_id: user)).to be_truthy diff --git a/spec/features/groups/packages_spec.rb b/spec/features/groups/packages_spec.rb index 9a7950266a5..3c2ade6b274 100644 --- a/spec/features/groups/packages_spec.rb +++ b/spec/features/groups/packages_spec.rb @@ -44,14 +44,6 @@ RSpec.describe 'Group Packages' do it_behaves_like 'packages list', check_project_name: true - context 'when package_details_apollo feature flag is off' do - before do - stub_feature_flags(package_details_apollo: false) - end - - it_behaves_like 'package details link' - end - it_behaves_like 'package details link' it 'allows you to navigate to the project page' do diff --git a/spec/features/groups/settings/packages_and_registries_spec.rb b/spec/features/groups/settings/packages_and_registries_spec.rb index 835555480dd..d3141da9160 100644 --- a/spec/features/groups/settings/packages_and_registries_spec.rb +++ b/spec/features/groups/settings/packages_and_registries_spec.rb @@ -90,9 +90,10 @@ RSpec.describe 'Group Packages & Registries settings' do expect(page).to have_content('Do not allow duplicates') fill_in 'Exceptions', with: ')' + + # simulate blur event + find('#maven-duplicated-settings-regex-input').native.send_keys(:tab) end - # simulate blur event - find('body').click expect(page).to have_content('is an invalid regexp') end diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb index 7082b2b20bd..d95eaf3c92c 100644 --- a/spec/features/groups/settings/repository_spec.rb +++ b/spec/features/groups/settings/repository_spec.rb @@ -18,11 +18,11 @@ RSpec.describe 'Group Repository settings' do before do stub_container_registry_config(enabled: true) - visit group_settings_repository_path(group) end it_behaves_like 'a deploy token in settings' do let(:entity_type) { 'group' } + let(:page_path) { group_settings_repository_path(group) } end end diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb index 79226facad4..eb62b6fa8ee 100644 --- a/spec/features/groups/show_spec.rb +++ b/spec/features/groups/show_spec.rb @@ -3,25 +3,74 @@ require 'spec_helper' RSpec.describe 'Group show page' do - let(:group) { create(:group) } + let_it_be(:user) { create(:user) } + let_it_be(:group) { create(:group) } + let(:path) { group_path(group) } context 'when signed in' do - let(:user) do - create(:group_member, :developer, user: create(:user), group: group ).user - end + context 'with non-admin group concerns' do + before do + group.add_developer(user) + sign_in(user) + visit path + end - before do - sign_in(user) - visit path + it_behaves_like "an autodiscoverable RSS feed with current_user's feed token" + + context 'when group does not exist' do + let(:path) { group_path('not-exist') } + + it { expect(status_code).to eq(404) } + end end - it_behaves_like "an autodiscoverable RSS feed with current_user's feed token" + context 'when user is an owner' do + before do + group.add_owner(user) + sign_in(user) + end + + it 'shows the invite banner and persists dismissal', :js do + visit path + + expect(page).to have_content('Collaborate with your team') - context 'when group does not exist' do - let(:path) { group_path('not-exist') } + page.within(find('[data-testid="invite-members-banner"]')) do + find('[data-testid="close-icon"]').click + end + + expect(page).not_to have_content('Collaborate with your team') + + visit path + + expect(page).not_to have_content('Collaborate with your team') + end + + context 'when group has a project with emoji in description', :js do + let!(:project) { create(:project, description: ':smile:', namespace: group) } + + it 'shows the project info', :aggregate_failures do + visit path + + expect(page).to have_content(project.title) + expect(page).to have_emoji('smile') + end + end - it { expect(status_code).to eq(404) } + context 'when group has projects' do + it 'allows users to sorts projects by most stars', :js do + project1 = create(:project, namespace: group, star_count: 2) + project2 = create(:project, namespace: group, star_count: 3) + project3 = create(:project, namespace: group, star_count: 0) + + visit group_path(group, sort: :stars_desc) + + expect(find('.group-row:nth-child(1) .namespace-title > a')).to have_content(project2.title) + expect(find('.group-row:nth-child(2) .namespace-title > a')).to have_content(project1.title) + expect(find('.group-row:nth-child(3) .namespace-title > a')).to have_content(project3.title) + end + end end end @@ -37,7 +86,7 @@ RSpec.describe 'Group show page' do context 'when group has a public project', :js do let!(:project) { create(:project, :public, namespace: group) } - it 'renders public project' do + it 'renders public project', :aggregate_failures do visit path expect(page).to have_link group.name @@ -48,7 +97,7 @@ RSpec.describe 'Group show page' do context 'when group has a private project', :js do let!(:project) { create(:project, :private, namespace: group) } - it 'does not render private project' do + it 'does not render private project', :aggregate_failures do visit path expect(page).to have_link group.name @@ -58,28 +107,19 @@ RSpec.describe 'Group show page' do end context 'subgroup support' do - let(:restricted_group) do + let_it_be(:restricted_group) do create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) end - let(:relaxed_group) do - create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) - end - - let(:owner) { create(:user) } - let(:maintainer) { create(:user) } - context 'for owners' do - let(:path) { group_path(restricted_group) } - before do - restricted_group.add_owner(owner) - sign_in(owner) + restricted_group.add_owner(user) + sign_in(user) end context 'when subgroups are supported' do it 'allows creating subgroups' do - visit path + visit group_path(restricted_group) expect(page).to have_link('New subgroup') end @@ -88,18 +128,21 @@ RSpec.describe 'Group show page' do context 'for maintainers' do before do - sign_in(maintainer) + sign_in(user) end context 'when subgroups are supported' do context 'when subgroup_creation_level is set to maintainers' do + let(:relaxed_group) do + create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) + end + before do - relaxed_group.add_maintainer(maintainer) + relaxed_group.add_maintainer(user) end it 'allows creating subgroups' do - path = group_path(relaxed_group) - visit path + visit group_path(relaxed_group) expect(page).to have_link('New subgroup') end @@ -107,12 +150,11 @@ RSpec.describe 'Group show page' do context 'when subgroup_creation_level is set to owners' do before do - restricted_group.add_maintainer(maintainer) + restricted_group.add_maintainer(user) end it 'does not allow creating subgroups' do - path = group_path(restricted_group) - visit path + visit group_path(restricted_group) expect(page).not_to have_link('New subgroup') end @@ -121,50 +163,10 @@ RSpec.describe 'Group show page' do end end - context 'group has a project with emoji in description', :js do - let(:user) { create(:user) } - let!(:project) { create(:project, description: ':smile:', namespace: group) } - - before do - group.add_owner(user) - sign_in(user) - visit path - end - - it 'shows the project info' do - expect(page).to have_content(project.title) - expect(page).to have_emoji('smile') - end - end - - context 'where group has projects' do - let(:user) { create(:user) } - - before do - group.add_owner(user) - sign_in(user) - end - - it 'allows users to sorts projects by most stars', :js do - project1 = create(:project, namespace: group, star_count: 2) - project2 = create(:project, namespace: group, star_count: 3) - project3 = create(:project, namespace: group, star_count: 0) - - visit group_path(group, sort: :stars_desc) - - expect(find('.group-row:nth-child(1) .namespace-title > a')).to have_content(project2.title) - expect(find('.group-row:nth-child(2) .namespace-title > a')).to have_content(project1.title) - expect(find('.group-row:nth-child(3) .namespace-title > a')).to have_content(project3.title) - end - end - context 'notification button', :js do - let(:maintainer) { create(:user) } - let!(:project) { create(:project, namespace: group) } - before do - group.add_maintainer(maintainer) - sign_in(maintainer) + group.add_maintainer(user) + sign_in(user) end it 'is enabled by default' do @@ -174,7 +176,8 @@ RSpec.describe 'Group show page' do end it 'is disabled if emails are disabled' do - group.update_attribute(:emails_disabled, true) + group.update!(emails_disabled: true) + visit path expect(page).to have_selector('[data-testid="notification-dropdown"] .disabled') @@ -182,12 +185,10 @@ RSpec.describe 'Group show page' do end context 'page og:description' do - let(:group) { create(:group, description: '**Lorem** _ipsum_ dolor sit [amet](https://example.com)') } - let(:maintainer) { create(:user) } - before do - group.add_maintainer(maintainer) - sign_in(maintainer) + group.update!(description: '**Lorem** _ipsum_ dolor sit [amet](https://example.com)') + group.add_maintainer(user) + sign_in(user) visit path end @@ -237,7 +238,7 @@ RSpec.describe 'Group show page' do end end - it 'does not include structured markup in shared projects tab', :js do + it 'does not include structured markup in shared projects tab', :aggregate_failures, :js do other_project = create(:project, :public) other_project.project_group_links.create!(group: group) @@ -248,7 +249,7 @@ RSpec.describe 'Group show page' do expect(page).not_to have_selector('[itemprop="owns"][itemtype="https://schema.org/SoftwareSourceCode"]') end - it 'does not include structured markup in archived projects tab', :js do + it 'does not include structured markup in archived projects tab', :aggregate_failures, :js do project.update!(archived: true) visit group_archived_path(group) |