diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-05 07:57:57 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | 54bfe70795e289b86485b2a57d72b6711e4994bd (patch) | |
| tree | 6cba31fce7354bd6f07daf31f057b6fa233e2589 /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | c4142cf9c0c0b217034c60a0a973d2e96b17a428 (diff) | |
| download | gitlab-ce-54bfe70795e289b86485b2a57d72b6711e4994bd.tar.gz | |
Add more tests to check conflicts resolution
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 06b37aa4997..31f43bdc89a 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -659,6 +659,7 @@ describe Projects::MergeRequestsController do id: merge_request.iid expect(merge_request.reload.title).to eq(merge_request.wipless_title) + end end describe 'GET conflict_for_path' do |