Merge branch 'dz-labels-subscribe-filter' into 'master'

Add subscribe filter to labels page

See merge request gitlab-org/gitlab-ce!21965

2 files changed, 24 insertions, 5 deletions

diff --git a/spec/finders/group_labels_finder_spec.rb b/spec/finders/group_labels_finder_spec.rb
index ef68fc105e4..7bdd312eff0 100644
--- a/spec/finders/group_labels_finder_spec.rb
+++ b/spec/finders/group_labels_finder_spec.rb
@@ -4,29 +4,38 @@ require 'spec_helper'
 
 describe GroupLabelsFinder, '#execute' do
   let!(:group) { create(:group) }
+  let!(:user)  { create(:user) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
   let!(:label2) { create(:group_label, title: 'Bar', description: 'Fusce consequat', group: group) }
 
   it 'returns all group labels sorted by name if no params' do
-    result = described_class.new(group).execute
+    result = described_class.new(user, group).execute
 
     expect(result.to_a).to match_array([label2, label1])
   end
 
   it 'returns all group labels sorted by name desc' do
-    result = described_class.new(group, sort: 'name_desc').execute
+    result = described_class.new(user, group, sort: 'name_desc').execute
 
     expect(result.to_a).to match_array([label2, label1])
   end
 
-  it 'returns group labels that march search' do
-    result = described_class.new(group, search: 'Foo').execute
+  it 'returns group labels that match search' do
+    result = described_class.new(user, group, search: 'Foo').execute
 
     expect(result.to_a).to match_array([label1])
   end
 
+  it 'returns group labels user subscribed to' do
+    label2.subscribe(user)
+
+    result = described_class.new(user, group, subscribed: 'true').execute
+
+    expect(result.to_a).to match_array([label2])
+  end
+
   it 'returns second page of labels' do
-    result = described_class.new(group, page: '2').execute
+    result = described_class.new(user, group, page: '2').execute
 
     expect(result.to_a).to match_array([])
   end
diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb
index f5cec8e349a..9abc52aa664 100644
--- a/spec/finders/labels_finder_spec.rb
+++ b/spec/finders/labels_finder_spec.rb
@@ -210,5 +210,15 @@ describe LabelsFinder do
         expect(finder.execute).to eq [project_label_1]
       end
     end
+
+    context 'filter by subscription' do
+      it 'returns labels user subscribed to' do
+        project_label_1.subscribe(user)
+
+        finder = described_class.new(user, subscribed: 'true')
+
+        expect(finder.execute).to eq [project_label_1]
+      end
+    end
   end
 end