| ... | ... | @@ -4,12 +4,7 @@ module QA |
|
|
|
context 'Create' do
|
|
|
|
describe 'Download merge request patch and diff' do
|
|
|
|
before(:context) do
|
|
|
|
project = Resource::Project.fabricate_via_api! do |project|
|
|
|
|
project.name = 'project'
|
|
|
|
end
|
|
|
|
|
|
|
|
@merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
|
|
|
|
merge_request.project = project
|
|
|
|
merge_request.title = 'This is a merge request'
|
|
|
|
merge_request.description = '... for downloading patches and diffs'
|
|
|
|
end
|
| ... | ... | @@ -23,7 +18,7 @@ module QA |
|
|
|
|
|
|
|
expect(page.text).to start_with('From')
|
|
|
|
expect(page).to have_content('Subject: [PATCH] This is a test commit')
|
|
|
|
expect(page).to have_content('diff --git a/added_file.txt b/added_file.txt')
|
|
|
|
expect(page).to have_content("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'views the merge request plain diff' do
|
| ... | ... | @@ -32,7 +27,7 @@ module QA |
|
|
|
@merge_request.visit!
|
|
|
|
Page::MergeRequest::Show.perform(&:view_plain_diff)
|
|
|
|
|
|
|
|
expect(page.text).to start_with('diff --git a/added_file.txt b/added_file.txt')
|
|
|
|
expect(page.text).to start_with("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
|
|
|
|
expect(page).to have_content('+File Added')
|
|
|
|
end
|
|
|
|
end
|
| ... | ... | |
| ... | ... | |