2016-07-27 14:55:12 +00:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
feature 'Merge Request versions', js: true, feature: true do
|
|
|
|
before do
|
|
|
|
login_as :admin
|
|
|
|
merge_request = create(:merge_request, importing: true)
|
|
|
|
merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9')
|
|
|
|
merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e')
|
|
|
|
project = merge_request.source_project
|
|
|
|
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'show the latest version of the diff' do
|
2016-09-01 12:23:39 +00:00
|
|
|
page.within '.mr-version-dropdown' do
|
2016-09-06 17:08:06 +00:00
|
|
|
expect(page).to have_content 'latest version'
|
2016-07-27 14:55:12 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
expect(page).to have_content '8 changed files'
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'switch between versions' do
|
|
|
|
before do
|
2016-09-01 12:23:39 +00:00
|
|
|
page.within '.mr-version-dropdown' do
|
2016-09-14 11:55:07 +00:00
|
|
|
find('.btn-default').click
|
2016-09-06 17:08:06 +00:00
|
|
|
click_link 'version 1'
|
2016-07-27 14:55:12 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should show older version' do
|
2016-09-01 12:23:39 +00:00
|
|
|
page.within '.mr-version-dropdown' do
|
2016-09-06 17:08:06 +00:00
|
|
|
expect(page).to have_content 'version 1'
|
2016-09-01 12:23:39 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
expect(page).to have_content '5 changed files'
|
|
|
|
end
|
2016-09-01 12:35:39 +00:00
|
|
|
|
|
|
|
it 'show the message about disabled comments' do
|
|
|
|
expect(page).to have_content 'Comments are disabled'
|
|
|
|
end
|
2016-09-01 12:23:39 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'compare with older version' do
|
|
|
|
before do
|
|
|
|
page.within '.mr-version-compare-dropdown' do
|
2016-09-14 11:55:07 +00:00
|
|
|
find('.btn-default').click
|
2016-09-06 17:08:06 +00:00
|
|
|
click_link 'version 1'
|
2016-09-01 12:23:39 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-14 11:55:07 +00:00
|
|
|
it 'should have correct value in the compare dropdown' do
|
2016-09-01 12:23:39 +00:00
|
|
|
page.within '.mr-version-compare-dropdown' do
|
2016-09-06 17:08:06 +00:00
|
|
|
expect(page).to have_content 'version 1'
|
2016-07-27 14:55:12 +00:00
|
|
|
end
|
2016-09-01 12:35:39 +00:00
|
|
|
end
|
2016-07-27 14:55:12 +00:00
|
|
|
|
2016-09-01 12:35:39 +00:00
|
|
|
it 'show the message about disabled comments' do
|
|
|
|
expect(page).to have_content 'Comments are disabled'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'show diff between new and old version' do
|
|
|
|
expect(page).to have_content '4 changed files with 15 additions and 6 deletions'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'show diff between new and old version' do
|
|
|
|
expect(page).to have_content '4 changed files with 15 additions and 6 deletions'
|
2016-07-27 14:55:12 +00:00
|
|
|
end
|
2016-09-14 11:55:07 +00:00
|
|
|
|
|
|
|
it 'should return to latest version when "Show latest version" button is clicked' do
|
|
|
|
click_link 'Show latest version'
|
|
|
|
page.within '.mr-version-dropdown' do
|
|
|
|
expect(page).to have_content 'latest version'
|
|
|
|
end
|
|
|
|
expect(page).to have_content '8 changed files'
|
|
|
|
end
|
2016-07-27 14:55:12 +00:00
|
|
|
end
|
|
|
|
end
|