From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- spec/features/projects/settings/repository_settings_spec.rb | 8 ++++---- spec/features/projects/settings/user_renames_a_project_spec.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/features/projects/settings') diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index 8beecedf85f..8c7b7bc70a2 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -70,7 +70,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do project.deploy_keys << private_deploy_key visit project_settings_repository_path(project) - find('.deploy-key', text: private_deploy_key.title).find('.ic-pencil').click + find('.deploy-key', text: private_deploy_key.title).find('[data-testid="pencil-icon"]').click fill_in 'deploy_key_title', with: 'updated_deploy_key' check 'deploy_key_deploy_keys_projects_attributes_0_can_push' @@ -84,7 +84,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do project.deploy_keys << public_deploy_key visit project_settings_repository_path(project) - find('.deploy-key', text: public_deploy_key.title).find('.ic-pencil').click + find('.deploy-key', text: public_deploy_key.title).find('[data-testid="pencil-icon"]').click check 'deploy_key_deploy_keys_projects_attributes_0_can_push' click_button 'Save changes' @@ -102,7 +102,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do find('.js-deployKeys-tab-available_project_keys').click - find('.deploy-key', text: private_deploy_key.title).find('.ic-pencil').click + find('.deploy-key', text: private_deploy_key.title).find('[data-testid="pencil-icon"]').click fill_in 'deploy_key_title', with: 'updated_deploy_key' click_button 'Save changes' @@ -116,7 +116,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do project.deploy_keys << private_deploy_key visit project_settings_repository_path(project) - accept_confirm { find('.deploy-key', text: private_deploy_key.title).find('.ic-remove').click } + accept_confirm { find('.deploy-key', text: private_deploy_key.title).find('[data-testid="remove-icon"]').click } expect(page).not_to have_content(private_deploy_key.title) end diff --git a/spec/features/projects/settings/user_renames_a_project_spec.rb b/spec/features/projects/settings/user_renames_a_project_spec.rb index 6088ea31661..1ff976eb800 100644 --- a/spec/features/projects/settings/user_renames_a_project_spec.rb +++ b/spec/features/projects/settings/user_renames_a_project_spec.rb @@ -37,7 +37,7 @@ RSpec.describe 'Projects > Settings > User renames a project' do it 'shows errors for invalid project path' do change_path(project, 'foo&bar') - expect(page).to have_field 'Path', with: 'foo&bar' + expect(page).to have_field 'Path', with: 'gitlab' expect(page).to have_content "Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'" end end -- cgit v1.2.3