diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-12-21 20:54:35 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-12-21 20:54:35 +0300 |
commit | 563a801c6ab7e6cb9d1481eb3fdc7c82d7942983 (patch) | |
tree | 96a97c12534d150cf4e6fdae9bfae7c1ee9bc3be /spec | |
parent | b8d79cc479200ff714f89dc43a3bbec18af3c5b5 (diff) | |
parent | d2f1d585e10e3e728f968ceae6b275e4d9bc59f4 (diff) |
Merge branch 'jprovazn-search' into 'master'
Skip projects filter on merge requests search
See merge request gitlab-org/gitlab-ce!15955
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/search_results_spec.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/lib/gitlab/search_results_spec.rb b/spec/lib/gitlab/search_results_spec.rb index e44a7c23452..a958baab44f 100644 --- a/spec/lib/gitlab/search_results_spec.rb +++ b/spec/lib/gitlab/search_results_spec.rb @@ -51,6 +51,17 @@ describe Gitlab::SearchResults do expect(results.objects('merge_requests')).to include merge_request_2 end + + it 'includes project filter by default' do + expect(results).to receive(:project_ids_relation).and_call_original + results.objects('merge_requests') + end + + it 'it skips project filter if default is used' do + allow(results).to receive(:default_project_filter).and_return(true) + expect(results).not_to receive(:project_ids_relation) + results.objects('merge_requests') + end end it 'does not list issues on private projects' do |