diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 15:10:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 15:10:41 +0300 |
commit | 04f9cef437b65b4a62624936a37a99cfbfb4d61c (patch) | |
tree | 9edb887220b45ecd69f2aefa22a0fea09ed03ee1 /spec/features/projects | |
parent | 47d07def1648ffc0787fe92ea5e351ccc5e9c4a4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects')
5 files changed, 35 insertions, 16 deletions
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb index 96a321037a9..b333f64aa87 100644 --- a/spec/features/projects/active_tabs_spec.rb +++ b/spec/features/projects/active_tabs_spec.rb @@ -18,12 +18,11 @@ RSpec.describe 'Project active tab' do end context 'on project Home' do - context 'when feature flag :sidebar_refactor is enabled' do - before do - visit project_path(project) - end + it 'activates Project scope menu' do + visit project_path(project) - it_behaves_like 'page has active tab', 'Project' + expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1) + expect(find('.sidebar-top-level-items > li.active')).to have_content(project.name) end context 'when feature flag :sidebar_refactor is disabled' do @@ -36,11 +35,23 @@ RSpec.describe 'Project active tab' do it_behaves_like 'page has active tab', 'Project' it_behaves_like 'page has active sub tab', 'Details' end + end - context 'on project Home/Activity' do + context 'on Project information' do + context 'default link' do before do visit project_path(project) - click_tab('Activity') + + click_link('Project information', match: :first) + end + + it_behaves_like 'page has active tab', 'Project' + it_behaves_like 'page has active sub tab', 'Activity' + end + + context 'on Project information/Activity' do + before do + visit activity_project_path(project) end it_behaves_like 'page has active tab', 'Project' diff --git a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb index 2a81c706525..37d6f299883 100644 --- a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb +++ b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb @@ -17,12 +17,13 @@ RSpec.describe 'User deletes feature flag user list', :js do end it 'deletes the list' do - visit(project_feature_flags_path(project, scope: 'userLists')) + visit(project_feature_flags_user_lists_path(project, scope: 'userLists')) delete_user_list_button.click delete_user_list_modal_confirmation_button.click - expect(page).to have_text('Lists 0') + expect(page).to have_text('Lists') + expect(page).not_to have_selector('[data-testid="ffUserListName"]') end end @@ -34,7 +35,7 @@ RSpec.describe 'User deletes feature flag user list', :js do end it 'does not delete the list' do - visit(project_feature_flags_path(project, scope: 'userLists')) + visit(project_feature_flags_user_lists_path(project, scope: 'userLists')) delete_user_list_button.click delete_user_list_modal_confirmation_button.click diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb index 7073741a92d..94543290050 100644 --- a/spec/features/projects/members/user_requests_access_spec.rb +++ b/spec/features/projects/members/user_requests_access_spec.rb @@ -3,8 +3,9 @@ require 'spec_helper' RSpec.describe 'Projects > Members > User requests access', :js do - let(:user) { create(:user) } - let(:project) { create(:project, :public, :repository) } + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, :public, :repository) } + let(:maintainer) { project.owner } before do @@ -47,6 +48,8 @@ RSpec.describe 'Projects > Members > User requests access', :js do expect(project.requesters.exists?(user_id: user)).to be_truthy + click_link 'Project information' + page.within('.nav-sidebar') do click_link('Members') end diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index ee5bf99fd75..bce11e6bc8a 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -17,6 +17,10 @@ RSpec.describe 'Project navbar' do end context 'when sidebar refactor feature flag is disabled' do + let(:project_context_nav_item) do + nil + end + before do stub_feature_flags(sidebar_refactor: false) insert_package_nav(_('Operations')) diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb index 1350ecf6e75..2f7844ff615 100644 --- a/spec/features/projects/user_uses_shortcuts_spec.rb +++ b/spec/features/projects/user_uses_shortcuts_spec.rb @@ -3,11 +3,11 @@ require 'spec_helper' RSpec.describe 'User uses shortcuts', :js do - let(:project) { create(:project, :repository) } - let(:user) { create(:user) } + let_it_be(:project) { create(:project, :repository) } + + let(:user) { project.owner } before do - project.add_maintainer(user) sign_in(user) visit(project_path(project)) @@ -74,7 +74,7 @@ RSpec.describe 'User uses shortcuts', :js do find('body').native.send_key('g') find('body').native.send_key('p') - expect(page).to have_active_navigation('Project') + expect(page).to have_active_navigation(project.name) end context 'when feature flag :sidebar_refactor is disabled' do |