summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-06 20:08:06 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-07 10:24:48 +0300
commit5f0535ac91cdf2a892fb697dc05f0930f2c6d434 (patch)
tree70beec88b3605598d94a4e6626a99b8e13d2ba2a /spec/features
parentffdfdc27e5f7d72f7ed48ece2dc06154e0c5b49e (diff)
downloadgitlab-ce-5f0535ac91cdf2a892fb697dc05f0930f2c6d434.tar.gz
Improve merge request version feature
* Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_requests/merge_request_versions_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/merge_requests/merge_request_versions_spec.rb b/spec/features/merge_requests/merge_request_versions_spec.rb
index 7ccf4e8e8f2..9e759de3752 100644
--- a/spec/features/merge_requests/merge_request_versions_spec.rb
+++ b/spec/features/merge_requests/merge_request_versions_spec.rb
@@ -12,7 +12,7 @@ feature 'Merge Request versions', js: true, feature: true do
it 'show the latest version of the diff' do
page.within '.mr-version-dropdown' do
- expect(page).to have_content 'Latest: 5937ac0a'
+ expect(page).to have_content 'latest version'
end
expect(page).to have_content '8 changed files'
@@ -22,13 +22,13 @@ feature 'Merge Request versions', js: true, feature: true do
before do
page.within '.mr-version-dropdown' do
find('.btn-link').click
- click_link '6f6d7e7e'
+ click_link 'version 1'
end
end
it 'should show older version' do
page.within '.mr-version-dropdown' do
- expect(page).to have_content '6f6d7e7e'
+ expect(page).to have_content 'version 1'
end
expect(page).to have_content '5 changed files'
@@ -43,13 +43,13 @@ feature 'Merge Request versions', js: true, feature: true do
before do
page.within '.mr-version-compare-dropdown' do
find('.btn-link').click
- click_link '6f6d7e7e'
+ click_link 'version 1'
end
end
it 'should has correct value in the compare dropdown' do
page.within '.mr-version-compare-dropdown' do
- expect(page).to have_content '6f6d7e7e'
+ expect(page).to have_content 'version 1'
end
end