Merge branch 'feature/subscribe-to-group-level-labels' into 'master'

Support subscribing to group labels

https://gitlab.com/gitlab-org/gitlab-ce/issues/23586

See merge request !7215

2 files changed, 81 insertions, 7 deletions

diff --git a/spec/features/projects/labels/subscription_spec.rb b/spec/features/projects/labels/subscription_spec.rb
new file mode 100644
index 00000000000..3130d87fba5
--- /dev/null
+++ b/spec/features/projects/labels/subscription_spec.rb
@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+feature 'Labels subscription', feature: true do
+  let(:user)     { create(:user) }
+  let(:group)    { create(:group) }
+  let(:project)  { create(:empty_project, :public, namespace: group) }
+  let!(:bug)     { create(:label, project: project, title: 'bug') }
+  let!(:feature) { create(:group_label, group: group, title: 'feature') }
+
+  context 'when signed in' do
+    before do
+      project.team << [user, :developer]
+      login_as user
+    end
+
+    scenario 'users can subscribe/unsubscribe to labels', js: true do
+      visit namespace_project_labels_path(project.namespace, project)
+
+      expect(page).to have_content('bug')
+      expect(page).to have_content('feature')
+
+      within "#project_label_#{bug.id}" do
+        expect(page).not_to have_button 'Unsubscribe'
+
+        click_button 'Subscribe'
+
+        expect(page).not_to have_button 'Subscribe'
+        expect(page).to have_button 'Unsubscribe'
+
+        click_button 'Unsubscribe'
+
+        expect(page).to have_button 'Subscribe'
+        expect(page).not_to have_button 'Unsubscribe'
+      end
+
+      within "#group_label_#{feature.id}" do
+        expect(page).not_to have_button 'Unsubscribe'
+
+        click_link_on_dropdown('Group level')
+
+        expect(page).not_to have_selector('.dropdown-group-label')
+        expect(page).to have_button 'Unsubscribe'
+
+        click_button 'Unsubscribe'
+
+        expect(page).to have_selector('.dropdown-group-label')
+
+        click_link_on_dropdown('Project level')
+
+        expect(page).not_to have_selector('.dropdown-group-label')
+        expect(page).to have_button 'Unsubscribe'
+      end
+    end
+  end
+
+  context 'when not signed in' do
+    it 'users can not subscribe/unsubscribe to labels' do
+      visit namespace_project_labels_path(project.namespace, project)
+
+      expect(page).to have_content 'bug'
+      expect(page).to have_content 'feature'
+      expect(page).not_to have_button('Subscribe')
+      expect(page).not_to have_selector('.dropdown-group-label')
+    end
+  end
+
+  def click_link_on_dropdown(text)
+    find('.dropdown-group-label').click
+
+    page.within('.dropdown-group-label') do
+      find('a.js-subscribe-button', text: text).click
+    end
+  end
+end
diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb
index 33b52d1547e..e2d9cfdd0b0 100644
--- a/spec/features/unsubscribe_links_spec.rb
+++ b/spec/features/unsubscribe_links_spec.rb
@@ -26,11 +26,11 @@ describe 'Unsubscribe links', feature: true do
         expect(current_path).to eq unsubscribe_sent_notification_path(SentNotification.last)
         expect(page).to have_text(%(Unsubscribe from issue #{issue.title} (#{issue.to_reference})))
         expect(page).to have_text(%(Are you sure you want to unsubscribe from issue #{issue.title} (#{issue.to_reference})?))
-        expect(issue.subscribed?(recipient)).to be_truthy
+        expect(issue.subscribed?(recipient, project)).to be_truthy
 
         click_link 'Unsubscribe'
 
-        expect(issue.subscribed?(recipient)).to be_falsey
+        expect(issue.subscribed?(recipient, project)).to be_falsey
         expect(current_path).to eq new_user_session_path
       end
 
@@ -38,11 +38,11 @@ describe 'Unsubscribe links', feature: true do
         visit body_link
 
         expect(current_path).to eq unsubscribe_sent_notification_path(SentNotification.last)
-        expect(issue.subscribed?(recipient)).to be_truthy
+        expect(issue.subscribed?(recipient, project)).to be_truthy
 
         click_link 'Cancel'
 
-        expect(issue.subscribed?(recipient)).to be_truthy
+        expect(issue.subscribed?(recipient, project)).to be_truthy
         expect(current_path).to eq new_user_session_path
       end
     end
@@ -51,7 +51,7 @@ describe 'Unsubscribe links', feature: true do
       visit header_link
 
       expect(page).to have_text('unsubscribed')
-      expect(issue.subscribed?(recipient)).to be_falsey
+      expect(issue.subscribed?(recipient, project)).to be_falsey
     end
   end
 
@@ -62,14 +62,14 @@ describe 'Unsubscribe links', feature: true do
       visit body_link
 
       expect(page).to have_text('unsubscribed')
-      expect(issue.subscribed?(recipient)).to be_falsey
+      expect(issue.subscribed?(recipient, project)).to be_falsey
     end
 
     it 'unsubscribes from the issue when visiting the link from the header' do
       visit header_link
 
       expect(page).to have_text('unsubscribed')
-      expect(issue.subscribed?(recipient)).to be_falsey
+      expect(issue.subscribed?(recipient, project)).to be_falsey
     end
   end
 end