blob: 8a7fb2021e6a13fda28618b263bba2c87762d95f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
# frozen_string_literal: true
module QA
RSpec.describe 'Create' do
describe 'Merge request suggestions', :reliable, product_group: :code_review do
let(:commit_message) { 'Applying suggested change for testing purposes.' }
let(:project) { create(:project, name: 'mr-suggestions-project') }
let(:merge_request) do
Resource::MergeRequest.fabricate_via_api! do |merge_request|
merge_request.project = project
merge_request.title = 'Needs some suggestions'
merge_request.description = '... so please add them.'
merge_request.file_content = File.read(
Runtime::Path.fixture('metrics_dashboards', 'templating.yml')
)
end
end
let(:dev_user) do
Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
end
before do
project.add_member(dev_user)
Flow::Login.sign_in(as: dev_user, skip_page_validation: true)
merge_request.visit!
Page::MergeRequest::Show.perform do |merge_request|
merge_request.click_diffs_tab
merge_request.add_suggestion_to_diff('This is the suggestion for line number 4!', 4)
end
Flow::Login.sign_in
merge_request.visit!
end
it 'applies a single suggestion with a custom message',
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347711' do
Page::MergeRequest::Show.perform do |merge_request|
merge_request.click_diffs_tab
merge_request.apply_suggestion_with_message(commit_message)
expect(merge_request).to have_suggestions_applied
merge_request.click_commits_tab
# Commit does not always display immediately and may require a page refresh
# Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/368735
# TODO: Remove page refresh logic once issue is resolved.
Support::Retrier.retry_on_exception(max_attempts: 2, reload_page: merge_request) do
expect(merge_request).to have_content(commit_message)
end
end
end
end
end
end
|
