diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /spec/services/search/group_service_spec.rb | |
parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'spec/services/search/group_service_spec.rb')
-rw-r--r-- | spec/services/search/group_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/search/group_service_spec.rb b/spec/services/search/group_service_spec.rb index 38f264f6e7b..cb3f02d2883 100644 --- a/spec/services/search/group_service_spec.rb +++ b/spec/services/search/group_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Search::GroupService, services: true do +describe Search::GroupService do shared_examples_for 'group search' do context 'finding projects by name' do let(:user) { create(:user) } @@ -17,7 +17,7 @@ describe Search::GroupService, services: true do let!(:project2) { create(:empty_project, :internal, namespace: nested_group, name: "Inner #{term} 2") } let!(:project3) { create(:empty_project, :internal, namespace: nested_group.parent, name: "Outer #{term}") } - let(:results) { Search::GroupService.new(user, search_group, search: term).execute } + let(:results) { described_class.new(user, search_group, search: term).execute } subject { results.objects('projects') } context 'in parent group' do |