From 9dc93a4519d9d5d7be48ff274127136236a3adb3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Apr 2021 23:50:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-11-stable-ee --- spec/features/groups/board_spec.rb | 2 +- spec/features/groups/clusters/user_spec.rb | 2 +- ...age_with_external_authorization_service_spec.rb | 4 ++-- spec/features/groups/group_settings_spec.rb | 2 +- spec/features/groups/issues_spec.rb | 2 +- spec/features/groups/labels/index_spec.rb | 2 +- ...master_adds_member_with_expiration_date_spec.rb | 1 + .../features/groups/members/request_access_spec.rb | 2 +- spec/features/groups/merge_requests_spec.rb | 2 +- spec/features/groups/milestone_spec.rb | 6 +++--- spec/features/groups/navbar_spec.rb | 6 +++--- .../settings/user_searches_in_settings_spec.rb | 23 +++++++++++++++++++--- 12 files changed, 36 insertions(+), 18 deletions(-) (limited to 'spec/features/groups') diff --git a/spec/features/groups/board_spec.rb b/spec/features/groups/board_spec.rb index aab3f5e68d5..b4c60ff4fa3 100644 --- a/spec/features/groups/board_spec.rb +++ b/spec/features/groups/board_spec.rb @@ -33,7 +33,7 @@ RSpec.describe 'Group Boards' do find('.gl-new-dropdown-item button').click end - click_button 'Submit issue' + click_button 'Create issue' expect(page).to have_content(issue_title) end diff --git a/spec/features/groups/clusters/user_spec.rb b/spec/features/groups/clusters/user_spec.rb index 97f8864aab2..2a7ededa39b 100644 --- a/spec/features/groups/clusters/user_spec.rb +++ b/spec/features/groups/clusters/user_spec.rb @@ -97,7 +97,7 @@ RSpec.describe 'User Cluster', :js do context 'when user disables the cluster' do before do page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click - page.within('.js-cluster-integration-form') { click_button 'Save changes' } + page.within('.js-cluster-details-form') { click_button 'Save changes' } end it 'user sees the successful message' do diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb index 8ef1b60d8ca..187d878472e 100644 --- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb +++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb @@ -19,7 +19,7 @@ RSpec.describe 'The group page' do expect(page).to have_link('Details') expect(page).to have_link('Activity') expect(page).to have_link('Issues') - expect(page).to have_link('Merge Requests') + expect(page).to have_link('Merge requests') expect(page).to have_link('Members') end end @@ -50,7 +50,7 @@ RSpec.describe 'The group page' do expect(page).not_to have_link('Contribution') expect(page).not_to have_link('Issues') - expect(page).not_to have_link('Merge Requests') + expect(page).not_to have_link('Merge requests') expect(page).to have_link('Members') end end diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb index 60cd1ebbbd7..00ad1006037 100644 --- a/spec/features/groups/group_settings_spec.rb +++ b/spec/features/groups/group_settings_spec.rb @@ -175,7 +175,7 @@ RSpec.describe 'Edit group settings' do end def updated_emails_disabled? - group.reload.clear_memoization(:emails_disabled) + group.reload.clear_memoization(:emails_disabled_memoized) group.emails_disabled? end end diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index 8ecd2beba68..b0d2f90145f 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -108,7 +108,7 @@ RSpec.describe 'Group issues page' do it 'shows projects only with issues feature enabled', :js do find('.empty-state .js-lazy-loaded') - find('.new-project-item-link').click + find('.empty-state .new-project-item-link').click page.within('.select2-results') do expect(page).to have_content(project.full_name) diff --git a/spec/features/groups/labels/index_spec.rb b/spec/features/groups/labels/index_spec.rb index 3de29231f5c..68f03368989 100644 --- a/spec/features/groups/labels/index_spec.rb +++ b/spec/features/groups/labels/index_spec.rb @@ -24,6 +24,6 @@ RSpec.describe 'Group labels' do end it 'shows an edit label button', :js do - expect(page).to have_selector('.label-action.edit') + expect(page).to have_selector('.edit') end end diff --git a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb index 38deee547a3..d31a7977f66 100644 --- a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js let_it_be(:user1) { create(:user, name: 'John Doe') } let_it_be(:group) { create(:group) } + let(:new_member) { create(:user, name: 'Mary Jane') } before do diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb index 307cb63ec8e..827962fee61 100644 --- a/spec/features/groups/members/request_access_spec.rb +++ b/spec/features/groups/members/request_access_spec.rb @@ -15,7 +15,7 @@ RSpec.describe 'Groups > Members > Request access' do end it 'request access feature is disabled' do - group.update(request_access_enabled: false) + group.update!(request_access_enabled: false) visit group_path(group) expect(page).not_to have_content 'Request Access' diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb index 43d4b6b23e0..f79c93157dc 100644 --- a/spec/features/groups/merge_requests_spec.rb +++ b/spec/features/groups/merge_requests_spec.rb @@ -27,7 +27,7 @@ RSpec.describe 'Group merge requests page' do end it 'ignores archived merge request count badges in navbar' do - expect(first(:link, text: 'Merge Requests').find('.badge').text).to eq("1") + expect(first(:link, text: 'Merge requests').find('.badge').text).to eq("1") end it 'ignores archived merge request count badges in state-filters' do diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb index 8d1008b98a6..1d9ac5ee1e9 100644 --- a/spec/features/groups/milestone_spec.rb +++ b/spec/features/groups/milestone_spec.rb @@ -133,7 +133,7 @@ RSpec.describe 'Group milestones' do href: project_issues_path(project, milestone_title: 'v1.0') ) expect(page).to have_link( - '0 Merge Requests', + '0 Merge requests', href: project_merge_requests_path(project, milestone_title: 'v1.0') ) expect(page).to have_link( @@ -145,7 +145,7 @@ RSpec.describe 'Group milestones' do href: issues_group_path(group, milestone_title: 'GL-113') ) expect(page).to have_link( - '0 Merge Requests', + '0 Merge requests', href: merge_requests_group_path(group, milestone_title: 'GL-113') ) end @@ -179,7 +179,7 @@ RSpec.describe 'Group milestones' do it 'renders the merge requests tab' do within('.js-milestone-tabs') do - click_link('Merge Requests') + click_link('Merge requests') end within('#tab-merge-requests') do diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb index 7025874a4ff..021b1af54d4 100644 --- a/spec/features/groups/navbar_spec.rb +++ b/spec/features/groups/navbar_spec.rb @@ -30,7 +30,7 @@ RSpec.describe 'Group navbar' do ] }, { - nav_item: _('Merge Requests'), + nav_item: _('Merge requests'), nav_sub_items: [] }, (security_and_compliance_nav_item if Gitlab.ee?), @@ -68,7 +68,7 @@ RSpec.describe 'Group navbar' do before do stub_config(registry: { enabled: true }) - insert_container_nav(_('Kubernetes')) + insert_container_nav visit group_path(group) end @@ -80,7 +80,7 @@ RSpec.describe 'Group navbar' do before do stub_config(dependency_proxy: { enabled: true }) - insert_dependency_proxy_nav(_('Dependency Proxy')) + insert_dependency_proxy_nav visit group_path(group) end 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 819d0c4faba..6d7a3871bb1 100644 --- a/spec/features/groups/settings/user_searches_in_settings_spec.rb +++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb @@ -5,7 +5,6 @@ require 'spec_helper' RSpec.describe 'User searches group settings', :js do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } - let_it_be(:project) { create(:project, :repository, namespace: group) } before do group.add_owner(user) @@ -13,9 +12,19 @@ RSpec.describe 'User searches group settings', :js do end context 'in general settings page' do - let(:visit_path) { edit_group_path(group) } + before do + visit edit_group_path(group) + end + + it_behaves_like 'can search settings', 'Naming', 'Permissions' + end + + context 'in Integrations page' do + before do + visit group_settings_integrations_path(group) + end - it_behaves_like 'can search settings with feature flag check', 'Naming', 'Permissions' + it_behaves_like 'can highlight results', 'set default configuration' end context 'in Repository page' do @@ -33,4 +42,12 @@ RSpec.describe 'User searches group settings', :js do it_behaves_like 'can search settings', 'Variables', 'Runners' end + + context 'in Packages & Registries page' do + before do + visit group_settings_packages_and_registries_path(group) + end + + it_behaves_like 'can highlight results', 'GitLab Packages' + end end -- cgit v1.2.1