From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- .../projects/settings/pipelines_settings_spec.rb | 2 +- .../projects/settings/project_settings_spec.rb | 4 +- .../projects/settings/registry_settings_spec.rb | 4 +- .../projects/settings/repository_settings_spec.rb | 6 +- .../user_manages_merge_requests_settings_spec.rb | 6 +- .../settings/user_manages_project_members_spec.rb | 134 +++++++++++++++------ .../projects/settings/visibility_settings_spec.rb | 4 +- 7 files changed, 112 insertions(+), 48 deletions(-) (limited to 'spec/features/projects/settings') diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb index c087237fd7c..39c4315bf0f 100644 --- a/spec/features/projects/settings/pipelines_settings_spec.rb +++ b/spec/features/projects/settings/pipelines_settings_spec.rb @@ -46,7 +46,7 @@ RSpec.describe "Projects > Settings > Pipelines settings" do it 'updates auto_cancel_pending_pipelines' do visit project_settings_ci_cd_path(project) - page.check('Auto-cancel redundant, pending pipelines') + page.check('Auto-cancel redundant pipelines') page.within '#js-general-pipeline-settings' do click_on 'Save changes' end diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb index 7b2b5594c22..cd1c9ecde9c 100644 --- a/spec/features/projects/settings/project_settings_spec.rb +++ b/spec/features/projects/settings/project_settings_spec.rb @@ -6,7 +6,7 @@ RSpec.describe 'Projects settings' do let_it_be(:project) { create(:project) } let(:user) { project.owner } let(:panel) { find('.general-settings', match: :first) } - let(:button) { panel.find('.btn.js-settings-toggle') } + let(:button) { panel.find('.btn.gl-button.js-settings-toggle') } let(:title) { panel.find('.settings-title') } before do @@ -39,7 +39,7 @@ RSpec.describe 'Projects settings' do visit edit_project_path(project) forking_enabled_input = find('input[name="project[project_feature_attributes][forking_access_level]"]', visible: :hidden) - forking_enabled_button = find('input[name="project[project_feature_attributes][forking_access_level]"] + label > button') + forking_enabled_button = find('[data-for="project[project_feature_attributes][forking_access_level]"] .gl-toggle') expect(forking_enabled_input.value).to eq('20') diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb index 2b03ecf5af1..6e4082d1391 100644 --- a/spec/features/projects/settings/registry_settings_spec.rb +++ b/spec/features/projects/settings/registry_settings_spec.rb @@ -39,7 +39,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p select('7 days', from: 'Remove tags older than:') fill_in('Remove tags matching:', with: '.*-production') - submit_button = find('.btn.btn-success') + submit_button = find('.btn.gl-button.btn-success') expect(submit_button).not_to be_disabled submit_button.click end @@ -53,7 +53,7 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p within '#js-registry-policies' do fill_in('Remove tags matching:', with: '*-production') - submit_button = find('.btn.btn-success') + submit_button = find('.btn.gl-button.btn-success') expect(submit_button).not_to be_disabled submit_button.click end diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index 3e520142117..2f257d299d8 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -63,7 +63,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Add key' expect(page).to have_content('new_deploy_key') - expect(page).to have_content('Write access allowed') + expect(page).to have_content('Grant write permissions to this key') end it 'edit an existing deploy key' do @@ -77,7 +77,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Save changes' expect(page).to have_content('updated_deploy_key') - expect(page).to have_content('Write access allowed') + expect(page).to have_content('Grant write permissions to this key') end it 'edit an existing public deploy key to be writable' do @@ -90,7 +90,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do click_button 'Save changes' expect(page).to have_content('public_deploy_key') - expect(page).to have_content('Write access allowed') + expect(page).to have_content('Grant write permissions to this key') end it 'edit a deploy key from projects user has access to' do diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index e97e4a2030a..e8e32d93f7b 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -51,7 +51,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do expect(page).to have_content 'All discussions must be resolved' within('.sharing-permissions-form') do - find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click + find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click find('input[value="Save changes"]').send_keys(:return) end @@ -71,7 +71,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do expect(page).to have_content 'All discussions must be resolved' within('.sharing-permissions-form') do - find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle').click + find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click find('input[value="Save changes"]').send_keys(:return) end @@ -92,7 +92,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do expect(page).not_to have_content 'All discussions must be resolved' within('.sharing-permissions-form') do - find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click + find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click find('input[value="Save changes"]').send_keys(:return) end diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb index 726b8fb6840..0d22da34b91 100644 --- a/spec/features/projects/settings/user_manages_project_members_spec.rb +++ b/spec/features/projects/settings/user_manages_project_members_spec.rb @@ -3,6 +3,9 @@ require 'spec_helper' RSpec.describe 'Projects > Settings > User manages project members' do + include Spec::Support::Helpers::Features::MembersHelpers + include Select2Helper + let(:group) { create(:group, name: 'OpenSource') } let(:project) { create(:project) } let(:project2) { create(:project) } @@ -16,62 +19,123 @@ RSpec.describe 'Projects > Settings > User manages project members' do sign_in(user) end - it 'cancels a team member', :js do - visit(project_project_members_path(project)) + context 'when `vue_project_members_list` feature flag is enabled' do + it 'cancels a team member', :js do + visit(project_project_members_path(project)) + + page.within find_member_row(user_dmitriy) do + click_button 'Remove member' + end + + page.within('[role="dialog"]') do + expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' + click_button('Remove member') + end + + visit(project_project_members_path(project)) + + expect(members_table).not_to have_content(user_dmitriy.name) + expect(members_table).not_to have_content(user_dmitriy.username) + end + + it 'imports a team from another project', :js do + stub_feature_flags(invite_members_group_modal: false) + + project2.add_maintainer(user) + project2.add_reporter(user_mike) + + visit(project_project_members_path(project)) - project_member = project.project_members.find_by(user_id: user_dmitriy.id) + page.within('.invite-users-form') do + click_link('Import') + end - page.within("#project_member_#{project_member.id}") do - # Open modal - click_on('Remove user from project') + select2(project2.id, from: '#source_project_id') + click_button('Import project members') + + expect(find_member_row(user_mike)).to have_content('Reporter') end - expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' + it 'shows all members of project shared group', :js do + group.add_owner(user) + group.add_developer(user_dmitriy) + + share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER) + share_link.group_id = group.id + share_link.save! - click_on('Remove member') + visit(project_project_members_path(project)) - visit(project_project_members_path(project)) + click_link 'Groups' - expect(page).not_to have_content(user_dmitriy.name) - expect(page).not_to have_content(user_dmitriy.username) + expect(find_group_row(group)).to have_content('Maintainer') + end end - it 'imports a team from another project' do - project2.add_maintainer(user) - project2.add_reporter(user_mike) + context 'when `vue_project_members_list` feature flag is disabled' do + before do + stub_feature_flags(vue_project_members_list: false) + end + + it 'cancels a team member', :js do + visit(project_project_members_path(project)) + + project_member = project.project_members.find_by(user_id: user_dmitriy.id) + + page.within("#project_member_#{project_member.id}") do + # Open modal + click_on('Remove user from project') + end + + expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' + + click_on('Remove member') - visit(project_project_members_path(project)) + visit(project_project_members_path(project)) - page.within('.invite-users-form') do - click_link('Import') + expect(page).not_to have_content(user_dmitriy.name) + expect(page).not_to have_content(user_dmitriy.username) end - select(project2.full_name, from: 'source_project_id') - click_button('Import') + it 'imports a team from another project' do + stub_feature_flags(invite_members_group_modal: false) - project_member = project.project_members.find_by(user_id: user_mike.id) + project2.add_maintainer(user) + project2.add_reporter(user_mike) - page.within("#project_member_#{project_member.id}") do - expect(page).to have_content('Mike') - expect(page).to have_content('Reporter') + visit(project_project_members_path(project)) + + page.within('.invite-users-form') do + click_link('Import') + end + + select(project2.full_name, from: 'source_project_id') + click_button('Import') + + project_member = project.project_members.find_by(user_id: user_mike.id) + + page.within("#project_member_#{project_member.id}") do + expect(page).to have_content('Mike') + expect(page).to have_content('Reporter') + end end - end - it 'shows all members of project shared group', :js do - group.add_owner(user) - group.add_developer(user_dmitriy) + it 'shows all members of project shared group', :js do + group.add_owner(user) + group.add_developer(user_dmitriy) - share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER) - share_link.group_id = group.id - share_link.save! + share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER) + share_link.group_id = group.id + share_link.save! - visit(project_project_members_path(project)) + visit(project_project_members_path(project)) - click_link 'Groups' + click_link 'Groups' - page.within('[data-testid="project-member-groups"]') do - expect(page).to have_content('OpenSource') - expect(first('.group_member')).to have_content('Maintainer') + page.within('[data-testid="project-member-groups"]') do + expect(page).to have_content('OpenSource') + expect(first('.group_member')).to have_content('Maintainer') + end end end end diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb index 6cecbbdb3d0..becb30c02b7 100644 --- a/spec/features/projects/settings/visibility_settings_spec.rb +++ b/spec/features/projects/settings/visibility_settings_spec.rb @@ -30,7 +30,7 @@ RSpec.describe 'Projects > Settings > Visibility settings', :js do context 'merge requests select' do it 'hides merge requests section' do - find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle').click + find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click expect(page).to have_selector('.merge-requests-feature', visible: false) end @@ -46,7 +46,7 @@ RSpec.describe 'Projects > Settings > Visibility settings', :js do context 'builds select' do it 'hides builds select section' do - find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle').click + find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click expect(page).to have_selector('.builds-feature', visible: false) end -- cgit v1.2.3