diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 17:15:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 17:15:38 +0300 |
commit | 28b374eea4e2890514067ac7875b4c1d252c5cdd (patch) | |
tree | 9fe30ae35df4b83cee000e1a0880b390d88d80f0 /spec/features | |
parent | c8fd9c521b89b98797cfd6e3a51cae6955129c20 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-ee
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_request/batch_comments_spec.rb | 10 | ||||
-rw-r--r-- | spec/features/projects/settings/repository_settings_spec.rb | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb index f892b01e624..fafaea8ac68 100644 --- a/spec/features/merge_request/batch_comments_spec.rb +++ b/spec/features/merge_request/batch_comments_spec.rb @@ -101,7 +101,7 @@ RSpec.describe 'Merge request > Batch comments', :js do write_diff_comment - visit_overview_with_pending_comment + visit_overview end it 'can add comment to review' do @@ -232,14 +232,6 @@ RSpec.describe 'Merge request > Batch comments', :js do wait_for_requests end - def visit_overview_with_pending_comment - accept_alert do - visit project_merge_request_path(merge_request.project, merge_request) - end - - wait_for_requests - end - def write_diff_comment(**params) click_diff_line(find_by_scrolling("[id='#{sample_compare.changes[0][:line_code]}']")) diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index ddfed73e2ca..63e0ee4a251 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -209,7 +209,9 @@ RSpec.describe 'Projects > Settings > Repository settings' do end it 'generates an SSH public key on submission', :js do - fill_in 'url', with: 'ssh://user@localhost/project.git' + fill_in 'url', with: ssh_url + expect(page).to have_css(".js-mirror-url-hidden[value=\"#{ssh_url}\"]", visible: false) + select 'SSH public key', from: 'Authentication method' select_direction |