diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-08-31 23:20:19 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-09-06 16:43:33 +0800 |
commit | 3cbfd0be8ca1bb65f9bc2f017517bb2806fb3c4c (patch) | |
tree | 2c92d8fee09e57d9eb4526d04608c3a6da1cd613 /spec/finders/merge_requests_finder_spec.rb | |
parent | 866465f6985d889c02a922a9b02c0803bb0be840 (diff) | |
download | gitlab-ce-3cbfd0be8ca1bb65f9bc2f017517bb2806fb3c4c.tar.gz |
Add projects parameter to IssuableFinder
Diffstat (limited to 'spec/finders/merge_requests_finder_spec.rb')
-rw-r--r-- | spec/finders/merge_requests_finder_spec.rb | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb index 78224f0b9da..6c0bbeff4f4 100644 --- a/spec/finders/merge_requests_finder_spec.rb +++ b/spec/finders/merge_requests_finder_spec.rb @@ -13,7 +13,7 @@ describe MergeRequestsFinder do expect(merge_requests).to contain_exactly(merge_request1, merge_request4, merge_request5) end - it 'filters by project' do + it 'filters by project_id' do params = { project_id: project1.id, scope: 'authored', state: 'opened' } merge_requests = described_class.new(user, params).execute @@ -21,6 +21,14 @@ describe MergeRequestsFinder do expect(merge_requests).to contain_exactly(merge_request1) end + it 'filters by projects' do + params = { projects: [project2.id, project3.id] } + + merge_requests = described_class.new(user, params).execute + + expect(merge_requests).to contain_exactly(merge_request3, merge_request4) + end + it 'filters by commit sha' do merge_requests = described_class.new( user, @@ -49,6 +57,16 @@ describe MergeRequestsFinder do expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request5) end + + it 'filters by group projects including subgroups' do + # project3 is not in the group, so it should not return merge_request4 + projects = [project3.id, project4.id] + params = { group_id: group.id, include_subgroups: true, projects: projects } + + merge_requests = described_class.new(user, params).execute + + expect(merge_requests).to contain_exactly(merge_request5) + end end it 'filters by non_archived' do |