Allow to include also descendant group labels

Because epic index page includes also epics from subgroups
it's necessary to also get descendant group labels for filtering.
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
index 3269f47f327..185b6b4ce57 100644
--- a/spec/controllers/groups/labels_controller_spec.rb
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Groups::LabelsController do
-  let(:group) { create(:group) }
-  let(:user)  { create(:user) }
-  let(:project) { create(:project, namespace: group) }
+  set(:group) { create(:group) }
+  set(:user)  { create(:user) }
+  set(:project) { create(:project, namespace: group) }
 
   before do
     group.add_owner(user)
@@ -12,8 +12,8 @@ describe Groups::LabelsController do
   end
 
   describe 'GET #index' do
-    let!(:label_1) { create(:label, project: project, title: 'label_1') }
-    let!(:group_label_1) { create(:group_label, group: group, title: 'group_label_1') }
+    set(:label_1) { create(:label, project: project, title: 'label_1') }
+    set(:group_label_1) { create(:group_label, group: group, title: 'group_label_1') }
 
     it 'returns group and project labels by default' do
       get :index, group_id: group, format: :json
@@ -23,8 +23,8 @@ describe Groups::LabelsController do
     end
 
     context 'with ancestor group', :nested_groups do
-      let(:subgroup) { create(:group, parent: group) }
-      let!(:subgroup_label_1) { create(:group_label, group: subgroup, title: 'subgroup_label_1') }
+      set(:subgroup) { create(:group, parent: group) }
+      set(:subgroup_label_1) { create(:group_label, group: subgroup, title: 'subgroup_label_1') }
 
       before do
         subgroup.add_owner(user)