diff options
author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-17 21:15:13 -0500 |
---|---|---|
committer | Rubén Dávila <rdavila84@gmail.com> | 2016-02-17 21:15:13 -0500 |
commit | 2770de961711076d1e8374bd943382eb14c90ad5 (patch) | |
tree | f2985fedcb69cf9fde4f9770b2d6f5ac3b4c0c68 /spec/controllers/projects | |
parent | ff28ac9c18231c54b9a925d26915bf3e29548ddd (diff) | |
download | gitlab-ce-2770de961711076d1e8374bd943382eb14c90ad5.tar.gz |
Reopened MRs should also be considered as open.issue_13539
Diffstat (limited to 'spec/controllers/projects')
-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, |