diff options
author | Robert Speicher <robert@gitlab.com> | 2016-02-18 09:21:58 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-18 15:00:45 +0300 |
commit | 03a156224b2a732325d662a78d0f5b19ec73ae98 (patch) | |
tree | bd4931802a1058bbc976aa8308db4eff35fc80f9 /spec | |
parent | d19fa9afdbe236c04fc2603f56d79e732c61320c (diff) |
Merge branch 'issue_13539' into 'master'
Reopened MRs should also be considered as open.
Fixes #13539
See merge request !2866
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 9450a389d81..e82fe26c7a6 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -123,6 +123,40 @@ describe Projects::MergeRequestsController do end end + describe 'GET #index' do + def get_merge_requests + get :index, + namespace_id: project.namespace.to_param, + project_id: project.to_param, + state: 'opened' + end + + context 'when filtering by opened state' do + + context 'with opened merge requests' do + it 'should list those merge requests' do + get_merge_requests + + expect(assigns(:merge_requests)).to include(merge_request) + end + end + + context 'with reopened merge requests' do + before do + merge_request.close! + merge_request.reopen! + end + + it 'should list those merge requests' do + get_merge_requests + + expect(assigns(:merge_requests)).to include(merge_request) + end + end + + end + end + describe 'GET diffs' do def go(format: 'html') get :diffs, |