diff options
author | Valery Sizov <valery@gitlab.com> | 2016-07-08 00:42:16 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2016-07-12 19:52:14 +0300 |
commit | c39356998b1850f3dc26fe0b987cb419c1d1afb4 (patch) | |
tree | b9cc4982fe65e1ae71146b7a9d4383b94126b8ae /spec/features/merge_requests/edit_mr_spec.rb | |
parent | a6a6970961cdfa3908384691ab37d9deb4785841 (diff) | |
download | gitlab-ce-c39356998b1850f3dc26fe0b987cb419c1d1afb4.tar.gz |
Optimistic locking for Issue and Merge Requests
Diffstat (limited to 'spec/features/merge_requests/edit_mr_spec.rb')
-rw-r--r-- | spec/features/merge_requests/edit_mr_spec.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb index 9e007ab7635..8ad884492d1 100644 --- a/spec/features/merge_requests/edit_mr_spec.rb +++ b/spec/features/merge_requests/edit_mr_spec.rb @@ -17,5 +17,16 @@ feature 'Edit Merge Request', feature: true do it 'form should have class js-quick-submit' do expect(page).to have_selector('.js-quick-submit') end + + it 'warns about version conflict' do + merge_request.update(title: "New title") + + fill_in 'merge_request_title', with: 'bug 345' + fill_in 'merge_request_description', with: 'bug description' + + click_button 'Save changes' + + expect(page).to have_content 'Someone edited the merge request the same time you did' + end end end |