From 4fcae04f7bb4823d740a18419f21b8d154b4ef89 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 31 Oct 2016 15:40:27 -0200
Subject: Add project_id to subscriptions

---
 spec/models/subscription_spec.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 spec/models/subscription_spec.rb

(limited to 'spec')

diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
new file mode 100644
index 00000000000..6cd6e01d0c7
--- /dev/null
+++ b/spec/models/subscription_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Subscription, models: true do
+  describe 'relationships' do
+    it { is_expected.to belong_to(:project) }
+    it { is_expected.to belong_to(:subscribable) }
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:subscribable) }
+    it { is_expected.to validate_presence_of(:user) }
+  end
+end
-- 
cgit v1.2.1


From bde0202693508aa9eb3ce76876b1c64120d51ef3 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 31 Oct 2016 16:36:28 -0200
Subject: Add unique index to subscriptions on subscribable and user and
 project

---
 spec/factories/subscriptions.rb  | 7 +++++++
 spec/models/subscription_spec.rb | 6 ++++++
 2 files changed, 13 insertions(+)
 create mode 100644 spec/factories/subscriptions.rb

(limited to 'spec')

diff --git a/spec/factories/subscriptions.rb b/spec/factories/subscriptions.rb
new file mode 100644
index 00000000000..b11b0a0a17b
--- /dev/null
+++ b/spec/factories/subscriptions.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :subscription do
+    user
+    project factory: :empty_project
+    subscribable factory: :issue
+  end
+end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index 6cd6e01d0c7..ab674958387 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -11,5 +11,11 @@ describe Subscription, models: true do
     it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:subscribable) }
     it { is_expected.to validate_presence_of(:user) }
+
+    it 'validates uniqueness of project_id scoped to subscribable_id, subscribable_type, and user_id' do
+      create(:subscription)
+
+      expect(subject).to validate_uniqueness_of(:project_id).scoped_to([:subscribable_id, :subscribable_type, :user_id])
+    end
   end
 end
-- 
cgit v1.2.1


From 9a2157a64684a32ba815cd33b0f48cd7ad3945a5 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 31 Oct 2016 17:19:14 -0200
Subject: Refactoring Subscribable concern to accept a project

---
 spec/models/concerns/subscribable_spec.rb | 44 ++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'spec')

diff --git a/spec/models/concerns/subscribable_spec.rb b/spec/models/concerns/subscribable_spec.rb
index b7fc5a92497..0a96cbbe166 100644
--- a/spec/models/concerns/subscribable_spec.rb
+++ b/spec/models/concerns/subscribable_spec.rb
@@ -1,67 +1,69 @@
 require 'spec_helper'
 
 describe Subscribable, 'Subscribable' do
-  let(:resource) { create(:issue) }
-  let(:user) { create(:user) }
+  let(:project)  { create(:empty_project) }
+  let(:resource) { create(:issue, project: project) }
+  let(:user)     { create(:user) }
 
   describe '#subscribed?' do
     it 'returns false when no subcription exists' do
-      expect(resource.subscribed?(user)).to be_falsey
+      expect(resource.subscribed?(user, project)).to be_falsey
     end
 
     it 'returns true when a subcription exists and subscribed is true' do
-      resource.subscriptions.create(user: user, subscribed: true)
+      resource.subscriptions.create(user: user, project: project, subscribed: true)
 
-      expect(resource.subscribed?(user)).to be_truthy
+      expect(resource.subscribed?(user, project)).to be_truthy
     end
 
     it 'returns false when a subcription exists and subscribed is false' do
-      resource.subscriptions.create(user: user, subscribed: false)
+      resource.subscriptions.create(user: user, project: project, subscribed: false)
 
-      expect(resource.subscribed?(user)).to be_falsey
+      expect(resource.subscribed?(user, project)).to be_falsey
     end
   end
+
   describe '#subscribers' do
     it 'returns [] when no subcribers exists' do
-      expect(resource.subscribers).to be_empty
+      expect(resource.subscribers(project)).to be_empty
     end
 
     it 'returns the subscribed users' do
-      resource.subscriptions.create(user: user, subscribed: true)
-      resource.subscriptions.create(user: create(:user), subscribed: false)
+      resource.subscriptions.create(user: user, project: project, subscribed: true)
+      resource.subscriptions.create(user: create(:user), project: project, subscribed: false)
 
-      expect(resource.subscribers).to eq [user]
+      expect(resource.subscribers(project)).to eq [user]
     end
   end
 
   describe '#toggle_subscription' do
     it 'toggles the current subscription state for the given user' do
-      expect(resource.subscribed?(user)).to be_falsey
+      expect(resource.subscribed?(user, project)).to be_falsey
 
-      resource.toggle_subscription(user)
+      resource.toggle_subscription(user, project)
 
-      expect(resource.subscribed?(user)).to be_truthy
+      expect(resource.subscribed?(user, project)).to be_truthy
     end
   end
 
   describe '#subscribe' do
     it 'subscribes the given user' do
-      expect(resource.subscribed?(user)).to be_falsey
+      expect(resource.subscribed?(user, project)).to be_falsey
 
-      resource.subscribe(user)
+      resource.subscribe(user, project)
 
-      expect(resource.subscribed?(user)).to be_truthy
+      expect(resource.subscribed?(user, project)).to be_truthy
     end
   end
 
   describe '#unsubscribe' do
     it 'unsubscribes the given current user' do
-      resource.subscriptions.create(user: user, subscribed: true)
-      expect(resource.subscribed?(user)).to be_truthy
+      resource.subscriptions.create(user: user, project: project, subscribed: true)
+      expect(resource.subscribed?(user, project)).to be_truthy
 
-      resource.unsubscribe(user)
+      resource.unsubscribe(user, project)
 
-      expect(resource.subscribed?(user)).to be_falsey
+      expect(resource.subscribed?(user, project)).to be_falsey
     end
   end
 end
-- 
cgit v1.2.1


From 38f16582725709ee89c7eeadd4415ed3e2fa57dc Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 1 Nov 2016 00:02:27 -0200
Subject: Refactoring notification service to find subscriptions per project

---
 spec/services/notification_service_spec.rb | 116 ++++++++++++++++++++---------
 1 file changed, 79 insertions(+), 37 deletions(-)

(limited to 'spec')

diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 8ce35354c22..3a5bd4a4084 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -342,7 +342,9 @@ describe NotificationService, services: true do
   end
 
   describe 'Issues' do
-    let(:project) { create(:empty_project, :public) }
+    let(:group) { create(:group) }
+    let(:project) { create(:empty_project, :public, namespace: group) }
+    let(:another_project) { create(:empty_project, :public, namespace: group) }
     let(:issue) { create :issue, project: project, assignee: create(:user), description: 'cc @participant' }
 
     before do
@@ -377,13 +379,21 @@ describe NotificationService, services: true do
       end
 
       it "emails subscribers of the issue's labels" do
-        subscriber = create(:user)
-        label = create(:label, issues: [issue])
+        user_1 = create(:user)
+        user_2 = create(:user)
+        user_3 = create(:user)
+        label = create(:label, project: project, issues: [issue])
+        group_label = create(:group_label, group: group, issues: [issue])
         issue.reload
-        label.toggle_subscription(subscriber)
+        label.toggle_subscription(user_1)
+        group_label.toggle_subscription(user_2, project)
+        group_label.toggle_subscription(user_3, another_project)
+
         notification.new_issue(issue, @u_disabled)
 
-        should_email(subscriber)
+        should_email(user_1)
+        should_email(user_2)
+        should_not_email(user_3)
       end
 
       context 'confidential issues' do
@@ -399,7 +409,7 @@ describe NotificationService, services: true do
           project.team << [member, :developer]
           project.team << [guest, :guest]
 
-          label = create(:label, issues: [confidential_issue])
+          label = create(:label, project: project, issues: [confidential_issue])
           confidential_issue.reload
           label.toggle_subscription(non_member)
           label.toggle_subscription(author)
@@ -554,20 +564,28 @@ describe NotificationService, services: true do
     end
 
     describe '#relabeled_issue' do
-      let(:label) { create(:label, issues: [issue]) }
-      let(:label2) { create(:label) }
-      let!(:subscriber_to_label) { create(:user).tap { |u| label.toggle_subscription(u) } }
-      let!(:subscriber_to_label2) { create(:user).tap { |u| label2.toggle_subscription(u) } }
+      let(:group_label_1) { create(:group_label, group: group, title: 'Group Label 1', issues: [issue]) }
+      let(:group_label_2) { create(:group_label, group: group, title: 'Group Label 2') }
+      let(:label_1) { create(:label, project: project, title: 'Label 1', issues: [issue]) }
+      let(:label_2) { create(:label, project: project, title: 'Label 2') }
+      let!(:subscriber_to_group_label_1) { create(:user).tap { |u| group_label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2) { create(:user).tap { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2_on_another_project) { create(:user).tap { |u| group_label_2.toggle_subscription(u, another_project) } }
+      let!(:subscriber_to_label_1) { create(:user).tap { |u| label_1.toggle_subscription(u) } }
+      let!(:subscriber_to_label_2) { create(:user).tap { |u| label_2.toggle_subscription(u) } }
 
       it "emails subscribers of the issue's added labels only" do
-        notification.relabeled_issue(issue, [label2], @u_disabled)
+        notification.relabeled_issue(issue, [group_label_2, label_2], @u_disabled)
 
-        should_not_email(subscriber_to_label)
-        should_email(subscriber_to_label2)
+        should_not_email(subscriber_to_label_1)
+        should_not_email(subscriber_to_group_label_1)
+        should_not_email(subscriber_to_group_label_2_on_another_project)
+        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_to_label_2)
       end
 
       it "doesn't send email to anyone but subscribers of the given labels" do
-        notification.relabeled_issue(issue, [label2], @u_disabled)
+        notification.relabeled_issue(issue, [group_label_2, label_2], @u_disabled)
 
         should_not_email(issue.assignee)
         should_not_email(issue.author)
@@ -578,8 +596,11 @@ describe NotificationService, services: true do
         should_not_email(@watcher_and_subscriber)
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
-        should_not_email(subscriber_to_label)
-        should_email(subscriber_to_label2)
+        should_not_email(subscriber_to_label_1)
+        should_not_email(subscriber_to_group_label_1)
+        should_not_email(subscriber_to_group_label_2_on_another_project)
+        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_to_label_2)
       end
 
       context 'confidential issues' do
@@ -590,8 +611,8 @@ describe NotificationService, services: true do
         let(:guest) { create(:user) }
         let(:admin) { create(:admin) }
         let(:confidential_issue) { create(:issue, :confidential, project: project, title: 'Confidential issue', author: author, assignee: assignee) }
-        let!(:label_1) { create(:label, issues: [confidential_issue]) }
-        let!(:label_2) { create(:label) }
+        let!(:label_1) { create(:label, project: project, issues: [confidential_issue]) }
+        let!(:label_2) { create(:label, project: project) }
 
         it "emails subscribers of the issue's labels that can read the issue" do
           project.team << [member, :developer]
@@ -725,7 +746,9 @@ describe NotificationService, services: true do
   end
 
   describe 'Merge Requests' do
-    let(:project) { create(:project, :public) }
+    let(:group) { create(:group) }
+    let(:project) { create(:project, :public, namespace: group) }
+    let(:another_project) { create(:empty_project, :public, namespace: group) }
     let(:merge_request) { create :merge_request, source_project: project, assignee: create(:user), description: 'cc @participant' }
 
     before do
@@ -758,12 +781,20 @@ describe NotificationService, services: true do
       end
 
       it "emails subscribers of the merge request's labels" do
-        subscriber = create(:user)
-        label = create(:label, merge_requests: [merge_request])
-        label.toggle_subscription(subscriber)
+        user_1 = create(:user)
+        user_2 = create(:user)
+        user_3 = create(:user)
+        label = create(:label, project: project, merge_requests: [merge_request])
+        group_label = create(:group_label, group: group, merge_requests: [merge_request])
+        label.toggle_subscription(user_1)
+        group_label.toggle_subscription(user_2, project)
+        group_label.toggle_subscription(user_3, another_project)
+
         notification.new_merge_request(merge_request, @u_disabled)
 
-        should_email(subscriber)
+        should_email(user_1)
+        should_email(user_2)
+        should_not_email(user_3)
       end
 
       context 'participating' do
@@ -857,20 +888,28 @@ describe NotificationService, services: true do
     end
 
     describe '#relabel_merge_request' do
-      let(:label) { create(:label, merge_requests: [merge_request]) }
-      let(:label2) { create(:label) }
-      let!(:subscriber_to_label) { create(:user).tap { |u| label.toggle_subscription(u) } }
-      let!(:subscriber_to_label2) { create(:user).tap { |u| label2.toggle_subscription(u) } }
+      let(:group_label_1) { create(:group_label, group: group, title: 'Group Label 1', merge_requests: [merge_request]) }
+      let(:group_label_2) { create(:group_label, group: group, title: 'Group Label 2') }
+      let(:label_1) { create(:label, project: project, title: 'Label 1', merge_requests: [merge_request]) }
+      let(:label_2) { create(:label, project: project, title: 'Label 2') }
+      let!(:subscriber_to_group_label_1) { create(:user).tap { |u| group_label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2) { create(:user).tap { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2_on_another_project) { create(:user).tap { |u| group_label_2.toggle_subscription(u, another_project) } }
+      let!(:subscriber_to_label_1) { create(:user).tap { |u| label_1.toggle_subscription(u) } }
+      let!(:subscriber_to_label_2) { create(:user).tap { |u| label_2.toggle_subscription(u) } }
 
       it "emails subscribers of the merge request's added labels only" do
-        notification.relabeled_merge_request(merge_request, [label2], @u_disabled)
+        notification.relabeled_merge_request(merge_request, [group_label_2, label_2], @u_disabled)
 
-        should_not_email(subscriber_to_label)
-        should_email(subscriber_to_label2)
+        should_not_email(subscriber_to_label_1)
+        should_not_email(subscriber_to_group_label_1)
+        should_not_email(subscriber_to_group_label_2_on_another_project)
+        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_to_label_2)
       end
 
       it "doesn't send email to anyone but subscribers of the given labels" do
-        notification.relabeled_merge_request(merge_request, [label2], @u_disabled)
+        notification.relabeled_merge_request(merge_request, [group_label_2, label_2], @u_disabled)
 
         should_not_email(merge_request.assignee)
         should_not_email(merge_request.author)
@@ -881,8 +920,11 @@ describe NotificationService, services: true do
         should_not_email(@unsubscriber)
         should_not_email(@u_participating)
         should_not_email(@u_lazy_participant)
-        should_not_email(subscriber_to_label)
-        should_email(subscriber_to_label2)
+        should_not_email(subscriber_to_label_1)
+        should_not_email(subscriber_to_group_label_1)
+        should_not_email(subscriber_to_group_label_2_on_another_project)
+        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_to_label_2)
       end
     end
 
@@ -1290,10 +1332,10 @@ describe NotificationService, services: true do
     project.team << [@unsubscriber, :master]
     project.team << [@watcher_and_subscriber, :master]
 
-    issuable.subscriptions.create(user: @subscriber, subscribed: true)
-    issuable.subscriptions.create(user: @subscribed_participant, subscribed: true)
-    issuable.subscriptions.create(user: @unsubscriber, subscribed: false)
+    issuable.subscriptions.create(user: @subscriber, project: project, subscribed: true)
+    issuable.subscriptions.create(user: @subscribed_participant, project: project, subscribed: true)
+    issuable.subscriptions.create(user: @unsubscriber, project: project, subscribed: false)
     # Make the watcher a subscriber to detect dupes
-    issuable.subscriptions.create(user: @watcher_and_subscriber, subscribed: true)
+    issuable.subscriptions.create(user: @watcher_and_subscriber, project: project, subscribed: true)
   end
 end
-- 
cgit v1.2.1


From 091efb315296306fd8c8d7c109ad6df77e7f28d5 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 1 Nov 2016 00:14:53 -0200
Subject: Fix specs to pass a project when creating subscriptions

---
 spec/controllers/sent_notifications_controller_spec.rb |  4 ++--
 spec/models/concerns/issuable_spec.rb                  | 10 ++++++----
 spec/services/issuable/bulk_update_service_spec.rb     |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'spec')

diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb
index 191e290a118..5ddfe84440e 100644
--- a/spec/controllers/sent_notifications_controller_spec.rb
+++ b/spec/controllers/sent_notifications_controller_spec.rb
@@ -7,7 +7,7 @@ describe SentNotificationsController, type: :controller do
 
   let(:issue) do
     create(:issue, project: project, author: user) do |issue|
-      issue.subscriptions.create(user: user, subscribed: true)
+      issue.subscriptions.create(user: user, project: project, subscribed: true)
     end
   end
 
@@ -85,7 +85,7 @@ describe SentNotificationsController, type: :controller do
       context 'when the force param is not passed' do
         let(:merge_request) do
           create(:merge_request, source_project: project, author: user) do |merge_request|
-            merge_request.subscriptions.create(user: user, subscribed: true)
+            merge_request.subscriptions.create(user: user, project: project, subscribed: true)
           end
         end
         let(:sent_notification) { create(:sent_notification, noteable: merge_request, recipient: user) }
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 6e987967ca5..e8fead767f2 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -176,6 +176,8 @@ describe Issue, "Issuable" do
   end
 
   describe '#subscribed?' do
+    let(:project) { issue.project }
+
     context 'user is not a participant in the issue' do
       before { allow(issue).to receive(:participants).with(user).and_return([]) }
 
@@ -184,13 +186,13 @@ describe Issue, "Issuable" do
       end
 
       it 'returns true when a subcription exists and subscribed is true' do
-        issue.subscriptions.create(user: user, subscribed: true)
+        issue.subscriptions.create(user: user, project: project, subscribed: true)
 
         expect(issue.subscribed?(user)).to be_truthy
       end
 
       it 'returns false when a subcription exists and subscribed is false' do
-        issue.subscriptions.create(user: user, subscribed: false)
+        issue.subscriptions.create(user: user, project: project, subscribed: false)
 
         expect(issue.subscribed?(user)).to be_falsey
       end
@@ -204,13 +206,13 @@ describe Issue, "Issuable" do
       end
 
       it 'returns true when a subcription exists and subscribed is true' do
-        issue.subscriptions.create(user: user, subscribed: true)
+        issue.subscriptions.create(user: user, project: project, subscribed: true)
 
         expect(issue.subscribed?(user)).to be_truthy
       end
 
       it 'returns false when a subcription exists and subscribed is false' do
-        issue.subscriptions.create(user: user, subscribed: false)
+        issue.subscriptions.create(user: user, project: project, subscribed: false)
 
         expect(issue.subscribed?(user)).to be_falsey
       end
diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb
index 6f7ce8ca992..f4a53f7e4c6 100644
--- a/spec/services/issuable/bulk_update_service_spec.rb
+++ b/spec/services/issuable/bulk_update_service_spec.rb
@@ -267,7 +267,7 @@ describe Issuable::BulkUpdateService, services: true do
   describe 'unsubscribe from issues' do
     let(:issues) do
       create_list(:closed_issue, 2, project: project) do |issue|
-        issue.subscriptions.create(user: user, subscribed: true)
+        issue.subscriptions.create(user: user, project: project, subscribed: true)
       end
     end
 
-- 
cgit v1.2.1


From 4a29fde577a7d5d7c46ffff7c5feb79be23cdaa8 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 1 Nov 2016 15:02:58 -0200
Subject: Allow users to subscribe to group labels at project-level

---
 .../controllers/projects/labels_controller_spec.rb | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'spec')

diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index 8faecec0063..2b51bae926b 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -72,14 +72,8 @@ describe Projects::LabelsController do
   end
 
   describe 'POST #generate' do
-    let(:admin) { create(:admin) }
-
-    before do
-      sign_in(admin)
-    end
-
     context 'personal project' do
-      let(:personal_project) { create(:empty_project) }
+      let(:personal_project) { create(:empty_project, namespace: user.namespace) }
 
       it 'creates labels' do
         post :generate, namespace_id: personal_project.namespace.to_param, project_id: personal_project.to_param
@@ -96,4 +90,22 @@ describe Projects::LabelsController do
       end
     end
   end
+
+  describe 'POST #toggle_subscription' do
+    it 'allows user to toggle subscription on project labels' do
+      label = create(:label, project: project)
+
+      post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project.to_param, id: label.id
+
+      expect(response).to have_http_status(200)
+    end
+
+    it 'allows user to toggle subscription on group labels' do
+      group_label = create(:group_label, group: group)
+
+      post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project.to_param, id: group_label.id
+
+      expect(response).to have_http_status(200)
+    end
+  end
 end
-- 
cgit v1.2.1


From 0c052f116c9e093936847280e833ca8985d2d94c Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 4 Nov 2016 16:19:08 -0200
Subject: Remove default value for `project` argument on subscribable concern

---
 .../projects/boards/issues_controller_spec.rb      |  2 +-
 .../sent_notifications_controller_spec.rb          | 14 +++----
 spec/features/unsubscribe_links_spec.rb            | 14 +++----
 spec/models/concerns/issuable_spec.rb              | 12 +++---
 spec/requests/api/issues_spec.rb                   |  4 +-
 spec/requests/api/labels_spec.rb                   |  6 +--
 spec/services/issuable/bulk_update_service_spec.rb |  4 +-
 spec/services/issues/update_service_spec.rb        |  2 +-
 .../services/merge_requests/update_service_spec.rb |  2 +-
 spec/services/notification_service_spec.rb         | 48 +++++++++++-----------
 .../slash_commands/interpret_service_spec.rb       |  4 +-
 .../issuable_slash_commands_shared_examples.rb     | 10 ++---
 12 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'spec')

diff --git a/spec/controllers/projects/boards/issues_controller_spec.rb b/spec/controllers/projects/boards/issues_controller_spec.rb
index cbe0417a4a7..299d2c981d3 100644
--- a/spec/controllers/projects/boards/issues_controller_spec.rb
+++ b/spec/controllers/projects/boards/issues_controller_spec.rb
@@ -25,7 +25,7 @@ describe Projects::Boards::IssuesController do
         create(:labeled_issue, project: project, labels: [planning])
         create(:labeled_issue, project: project, labels: [development], due_date: Date.tomorrow)
         create(:labeled_issue, project: project, labels: [development], assignee: johndoe)
-        issue.subscribe(johndoe)
+        issue.subscribe(johndoe, project)
 
         list_issues user: user, board: board, list: list2
 
diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb
index 5ddfe84440e..954fc2eaf21 100644
--- a/spec/controllers/sent_notifications_controller_spec.rb
+++ b/spec/controllers/sent_notifications_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe SentNotificationsController, type: :controller do
   let(:user) { create(:user) }
   let(:project) { create(:empty_project) }
-  let(:sent_notification) { create(:sent_notification, noteable: issue, recipient: user) }
+  let(:sent_notification) { create(:sent_notification, project: project, noteable: issue, recipient: user) }
 
   let(:issue) do
     create(:issue, project: project, author: user) do |issue|
@@ -17,7 +17,7 @@ describe SentNotificationsController, type: :controller do
         before { get(:unsubscribe, id: sent_notification.reply_key, force: true) }
 
         it 'unsubscribes the user' do
-          expect(issue.subscribed?(user)).to be_falsey
+          expect(issue.subscribed?(user, project)).to be_falsey
         end
 
         it 'sets the flash message' do
@@ -33,7 +33,7 @@ describe SentNotificationsController, type: :controller do
         before { get(:unsubscribe, id: sent_notification.reply_key) }
 
         it 'does not unsubscribe the user' do
-          expect(issue.subscribed?(user)).to be_truthy
+          expect(issue.subscribed?(user, project)).to be_truthy
         end
 
         it 'does not set the flash message' do
@@ -53,7 +53,7 @@ describe SentNotificationsController, type: :controller do
         before { get(:unsubscribe, id: sent_notification.reply_key.reverse) }
 
         it 'does not unsubscribe the user' do
-          expect(issue.subscribed?(user)).to be_truthy
+          expect(issue.subscribed?(user, project)).to be_truthy
         end
 
         it 'does not set the flash message' do
@@ -69,7 +69,7 @@ describe SentNotificationsController, type: :controller do
         before { get(:unsubscribe, id: sent_notification.reply_key, force: true) }
 
         it 'unsubscribes the user' do
-          expect(issue.subscribed?(user)).to be_falsey
+          expect(issue.subscribed?(user, project)).to be_falsey
         end
 
         it 'sets the flash message' do
@@ -88,11 +88,11 @@ describe SentNotificationsController, type: :controller do
             merge_request.subscriptions.create(user: user, project: project, subscribed: true)
           end
         end
-        let(:sent_notification) { create(:sent_notification, noteable: merge_request, recipient: user) }
+        let(:sent_notification) { create(:sent_notification, project: project, noteable: merge_request, recipient: user) }
         before { get(:unsubscribe, id: sent_notification.reply_key) }
 
         it 'unsubscribes the user' do
-          expect(merge_request.subscribed?(user)).to be_falsey
+          expect(merge_request.subscribed?(user, project)).to be_falsey
         end
 
         it 'sets the flash message' do
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
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index e8fead767f2..6f84bffe046 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -182,19 +182,19 @@ describe Issue, "Issuable" do
       before { allow(issue).to receive(:participants).with(user).and_return([]) }
 
       it 'returns false when no subcription exists' do
-        expect(issue.subscribed?(user)).to be_falsey
+        expect(issue.subscribed?(user, project)).to be_falsey
       end
 
       it 'returns true when a subcription exists and subscribed is true' do
         issue.subscriptions.create(user: user, project: project, subscribed: true)
 
-        expect(issue.subscribed?(user)).to be_truthy
+        expect(issue.subscribed?(user, project)).to be_truthy
       end
 
       it 'returns false when a subcription exists and subscribed is false' do
         issue.subscriptions.create(user: user, project: project, subscribed: false)
 
-        expect(issue.subscribed?(user)).to be_falsey
+        expect(issue.subscribed?(user, project)).to be_falsey
       end
     end
 
@@ -202,19 +202,19 @@ describe Issue, "Issuable" do
       before { allow(issue).to receive(:participants).with(user).and_return([user]) }
 
       it 'returns false when no subcription exists' do
-        expect(issue.subscribed?(user)).to be_truthy
+        expect(issue.subscribed?(user, project)).to be_truthy
       end
 
       it 'returns true when a subcription exists and subscribed is true' do
         issue.subscriptions.create(user: user, project: project, subscribed: true)
 
-        expect(issue.subscribed?(user)).to be_truthy
+        expect(issue.subscribed?(user, project)).to be_truthy
       end
 
       it 'returns false when a subcription exists and subscribed is false' do
         issue.subscriptions.create(user: user, project: project, subscribed: false)
 
-        expect(issue.subscribed?(user)).to be_falsey
+        expect(issue.subscribed?(user, project)).to be_falsey
       end
     end
   end
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index beed53d1e5c..7bae055b241 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -637,7 +637,7 @@ describe API::API, api: true  do
 
     it "sends notifications for subscribers of newly added labels" do
       label = project.labels.first
-      label.toggle_subscription(user2)
+      label.toggle_subscription(user2, project)
 
       perform_enqueued_jobs do
         post api("/projects/#{project.id}/issues", user),
@@ -828,7 +828,7 @@ describe API::API, api: true  do
 
     it "sends notifications for subscribers of newly added labels when issue is updated" do
       label = create(:label, title: 'foo', color: '#FFAABB', project: project)
-      label.toggle_subscription(user2)
+      label.toggle_subscription(user2, project)
 
       perform_enqueued_jobs do
         put api("/projects/#{project.id}/issues/#{issue.id}", user),
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index 77dfebf1a98..aaf41639277 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -339,7 +339,7 @@ describe API::API, api: true  do
     end
 
     context "when user is already subscribed to label" do
-      before { label1.subscribe(user) }
+      before { label1.subscribe(user, project) }
 
       it "returns 304" do
         post api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
@@ -358,7 +358,7 @@ describe API::API, api: true  do
   end
 
   describe "DELETE /projects/:id/labels/:label_id/subscription" do
-    before { label1.subscribe(user) }
+    before { label1.subscribe(user, project) }
 
     context "when label_id is a label title" do
       it "unsubscribes from the label" do
@@ -381,7 +381,7 @@ describe API::API, api: true  do
     end
 
     context "when user is already unsubscribed from label" do
-      before { label1.unsubscribe(user) }
+      before { label1.unsubscribe(user, project) }
 
       it "returns 304" do
         delete api("/projects/#{project.id}/labels/#{label1.id}/subscription", user)
diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb
index f4a53f7e4c6..5f3020b6525 100644
--- a/spec/services/issuable/bulk_update_service_spec.rb
+++ b/spec/services/issuable/bulk_update_service_spec.rb
@@ -260,7 +260,7 @@ describe Issuable::BulkUpdateService, services: true do
     it 'subscribes the given user' do
       bulk_update(issues, subscription_event: 'subscribe')
 
-      expect(issues).to all(be_subscribed(user))
+      expect(issues).to all(be_subscribed(user, project))
     end
   end
 
@@ -275,7 +275,7 @@ describe Issuable::BulkUpdateService, services: true do
       bulk_update(issues, subscription_event: 'unsubscribe')
 
       issues.each do |issue|
-        expect(issue).not_to be_subscribed(user)
+        expect(issue).not_to be_subscribed(user, project)
       end
     end
   end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 1638a46ed51..4777a90639e 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -215,7 +215,7 @@ describe Issues::UpdateService, services: true do
 
       let!(:subscriber) do
         create(:user).tap do |u|
-          label.toggle_subscription(u)
+          label.toggle_subscription(u, project)
           project.team << [u, :developer]
         end
       end
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 2433a7dad06..cb5d7cdb467 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -199,7 +199,7 @@ describe MergeRequests::UpdateService, services: true do
 
     context 'when the issue is relabeled' do
       let!(:non_subscriber) { create(:user) }
-      let!(:subscriber) { create(:user).tap { |u| label.toggle_subscription(u) } }
+      let!(:subscriber) { create(:user) { |u| label.toggle_subscription(u, project) } }
 
       before do
         project.team << [non_subscriber, :developer]
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 3a5bd4a4084..64e378d8328 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -385,7 +385,7 @@ describe NotificationService, services: true do
         label = create(:label, project: project, issues: [issue])
         group_label = create(:group_label, group: group, issues: [issue])
         issue.reload
-        label.toggle_subscription(user_1)
+        label.toggle_subscription(user_1, project)
         group_label.toggle_subscription(user_2, project)
         group_label.toggle_subscription(user_3, another_project)
 
@@ -411,12 +411,12 @@ describe NotificationService, services: true do
 
           label = create(:label, project: project, issues: [confidential_issue])
           confidential_issue.reload
-          label.toggle_subscription(non_member)
-          label.toggle_subscription(author)
-          label.toggle_subscription(assignee)
-          label.toggle_subscription(member)
-          label.toggle_subscription(guest)
-          label.toggle_subscription(admin)
+          label.toggle_subscription(non_member, project)
+          label.toggle_subscription(author, project)
+          label.toggle_subscription(assignee, project)
+          label.toggle_subscription(member, project)
+          label.toggle_subscription(guest, project)
+          label.toggle_subscription(admin, project)
 
           reset_delivered_emails!
 
@@ -568,11 +568,11 @@ describe NotificationService, services: true do
       let(:group_label_2) { create(:group_label, group: group, title: 'Group Label 2') }
       let(:label_1) { create(:label, project: project, title: 'Label 1', issues: [issue]) }
       let(:label_2) { create(:label, project: project, title: 'Label 2') }
-      let!(:subscriber_to_group_label_1) { create(:user).tap { |u| group_label_1.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2) { create(:user).tap { |u| group_label_2.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2_on_another_project) { create(:user).tap { |u| group_label_2.toggle_subscription(u, another_project) } }
-      let!(:subscriber_to_label_1) { create(:user).tap { |u| label_1.toggle_subscription(u) } }
-      let!(:subscriber_to_label_2) { create(:user).tap { |u| label_2.toggle_subscription(u) } }
+      let!(:subscriber_to_group_label_1) { create(:user) { |u| group_label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2_on_another_project) { create(:user) { |u| group_label_2.toggle_subscription(u, another_project) } }
+      let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
 
       it "emails subscribers of the issue's added labels only" do
         notification.relabeled_issue(issue, [group_label_2, label_2], @u_disabled)
@@ -618,12 +618,12 @@ describe NotificationService, services: true do
           project.team << [member, :developer]
           project.team << [guest, :guest]
 
-          label_2.toggle_subscription(non_member)
-          label_2.toggle_subscription(author)
-          label_2.toggle_subscription(assignee)
-          label_2.toggle_subscription(member)
-          label_2.toggle_subscription(guest)
-          label_2.toggle_subscription(admin)
+          label_2.toggle_subscription(non_member, project)
+          label_2.toggle_subscription(author, project)
+          label_2.toggle_subscription(assignee, project)
+          label_2.toggle_subscription(member, project)
+          label_2.toggle_subscription(guest, project)
+          label_2.toggle_subscription(admin, project)
 
           reset_delivered_emails!
 
@@ -786,7 +786,7 @@ describe NotificationService, services: true do
         user_3 = create(:user)
         label = create(:label, project: project, merge_requests: [merge_request])
         group_label = create(:group_label, group: group, merge_requests: [merge_request])
-        label.toggle_subscription(user_1)
+        label.toggle_subscription(user_1, project)
         group_label.toggle_subscription(user_2, project)
         group_label.toggle_subscription(user_3, another_project)
 
@@ -892,11 +892,11 @@ describe NotificationService, services: true do
       let(:group_label_2) { create(:group_label, group: group, title: 'Group Label 2') }
       let(:label_1) { create(:label, project: project, title: 'Label 1', merge_requests: [merge_request]) }
       let(:label_2) { create(:label, project: project, title: 'Label 2') }
-      let!(:subscriber_to_group_label_1) { create(:user).tap { |u| group_label_1.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2) { create(:user).tap { |u| group_label_2.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2_on_another_project) { create(:user).tap { |u| group_label_2.toggle_subscription(u, another_project) } }
-      let!(:subscriber_to_label_1) { create(:user).tap { |u| label_1.toggle_subscription(u) } }
-      let!(:subscriber_to_label_2) { create(:user).tap { |u| label_2.toggle_subscription(u) } }
+      let!(:subscriber_to_group_label_1) { create(:user) { |u| group_label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_to_group_label_2_on_another_project) { create(:user) { |u| group_label_2.toggle_subscription(u, another_project) } }
+      let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
+      let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
 
       it "emails subscribers of the merge request's added labels only" do
         notification.relabeled_merge_request(merge_request, [group_label_2, label_2], @u_disabled)
diff --git a/spec/services/slash_commands/interpret_service_spec.rb b/spec/services/slash_commands/interpret_service_spec.rb
index b57e338b782..becf627a4f5 100644
--- a/spec/services/slash_commands/interpret_service_spec.rb
+++ b/spec/services/slash_commands/interpret_service_spec.rb
@@ -169,7 +169,7 @@ describe SlashCommands::InterpretService, services: true do
 
     shared_examples 'unsubscribe command' do
       it 'populates subscription_event: "unsubscribe" if content contains /unsubscribe' do
-        issuable.subscribe(developer)
+        issuable.subscribe(developer, project)
         _, updates = service.execute(content, issuable)
 
         expect(updates).to eq(subscription_event: 'unsubscribe')
@@ -321,7 +321,7 @@ describe SlashCommands::InterpretService, services: true do
     it_behaves_like 'multiple label with same argument' do
       let(:content) { %(/label ~"#{inprogress.title}" \n/label ~#{inprogress.title}) }
       let(:issuable) { issue }
-    end	
+    end
 
     it_behaves_like 'unlabel command' do
       let(:content) { %(/unlabel ~"#{inprogress.title}") }
diff --git a/spec/support/features/issuable_slash_commands_shared_examples.rb b/spec/support/features/issuable_slash_commands_shared_examples.rb
index 5e3b8f2b23e..194620d0a68 100644
--- a/spec/support/features/issuable_slash_commands_shared_examples.rb
+++ b/spec/support/features/issuable_slash_commands_shared_examples.rb
@@ -230,31 +230,31 @@ shared_examples 'issuable record that supports slash commands in its description
 
     context "with a note subscribing to the #{issuable_type}" do
       it "creates a new todo for the #{issuable_type}" do
-        expect(issuable.subscribed?(master)).to be_falsy
+        expect(issuable.subscribed?(master, project)).to be_falsy
 
         write_note("/subscribe")
 
         expect(page).not_to have_content '/subscribe'
         expect(page).to have_content 'Your commands have been executed!'
 
-        expect(issuable.subscribed?(master)).to be_truthy
+        expect(issuable.subscribed?(master, project)).to be_truthy
       end
     end
 
     context "with a note unsubscribing to the #{issuable_type} as done" do
       before do
-        issuable.subscribe(master)
+        issuable.subscribe(master, project)
       end
 
       it "creates a new todo for the #{issuable_type}" do
-        expect(issuable.subscribed?(master)).to be_truthy
+        expect(issuable.subscribed?(master, project)).to be_truthy
 
         write_note("/unsubscribe")
 
         expect(page).not_to have_content '/unsubscribe'
         expect(page).to have_content 'Your commands have been executed!'
 
-        expect(issuable.subscribed?(master)).to be_falsy
+        expect(issuable.subscribed?(master, project)).to be_falsy
       end
     end
   end
-- 
cgit v1.2.1


From 9dfbe1d2a1e71ddc1f30c21a238ff8d73f271eba Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 4 Nov 2016 16:22:57 -0200
Subject: Add helper method to toggle label subscription on labels controller
 spec

---
 spec/controllers/projects/labels_controller_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'spec')

diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index 2b51bae926b..ec6cea5c0f4 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -95,7 +95,7 @@ describe Projects::LabelsController do
     it 'allows user to toggle subscription on project labels' do
       label = create(:label, project: project)
 
-      post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project.to_param, id: label.id
+      toggle_subscription(label)
 
       expect(response).to have_http_status(200)
     end
@@ -103,9 +103,13 @@ describe Projects::LabelsController do
     it 'allows user to toggle subscription on group labels' do
       group_label = create(:group_label, group: group)
 
-      post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project.to_param, id: group_label.id
+      toggle_subscription(group_label)
 
       expect(response).to have_http_status(200)
     end
+
+    def toggle_subscription(label)
+      post :toggle_subscription, namespace_id: project.namespace.to_param, project_id: project.to_param, id: label.to_param
+    end
   end
 end
-- 
cgit v1.2.1


From 0aac2e0706cd767993148826d723aa3641cbb2a4 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 14 Nov 2016 20:42:22 -0200
Subject: Allow subscriptions to be created without a project

---
 spec/models/concerns/subscribable_spec.rb  | 109 ++++++++++++++++++++++-------
 spec/models/subscription_spec.rb           |   1 -
 spec/services/notification_service_spec.rb |  24 +++++--
 3 files changed, 102 insertions(+), 32 deletions(-)

(limited to 'spec')

diff --git a/spec/models/concerns/subscribable_spec.rb b/spec/models/concerns/subscribable_spec.rb
index 0a96cbbe166..58f5c164116 100644
--- a/spec/models/concerns/subscribable_spec.rb
+++ b/spec/models/concerns/subscribable_spec.rb
@@ -3,23 +3,43 @@ require 'spec_helper'
 describe Subscribable, 'Subscribable' do
   let(:project)  { create(:empty_project) }
   let(:resource) { create(:issue, project: project) }
-  let(:user)     { create(:user) }
+  let(:user_1)   { create(:user) }
 
   describe '#subscribed?' do
-    it 'returns false when no subcription exists' do
-      expect(resource.subscribed?(user, project)).to be_falsey
-    end
+    context 'without project' do
+      it 'returns false when no subscription exists' do
+        expect(resource.subscribed?(user_1)).to be_falsey
+      end
+
+      it 'returns true when a subcription exists and subscribed is true' do
+        resource.subscriptions.create(user: user_1, subscribed: true)
+
+        expect(resource.subscribed?(user_1)).to be_truthy
+      end
 
-    it 'returns true when a subcription exists and subscribed is true' do
-      resource.subscriptions.create(user: user, project: project, subscribed: true)
+      it 'returns false when a subcription exists and subscribed is false' do
+        resource.subscriptions.create(user: user_1, subscribed: false)
 
-      expect(resource.subscribed?(user, project)).to be_truthy
+        expect(resource.subscribed?(user_1)).to be_falsey
+      end
     end
 
-    it 'returns false when a subcription exists and subscribed is false' do
-      resource.subscriptions.create(user: user, project: project, subscribed: false)
+    context 'with project' do
+      it 'returns false when no subscription exists' do
+        expect(resource.subscribed?(user_1, project)).to be_falsey
+      end
+
+      it 'returns true when a subcription exists and subscribed is true' do
+        resource.subscriptions.create(user: user_1, project: project, subscribed: true)
+
+        expect(resource.subscribed?(user_1, project)).to be_truthy
+      end
 
-      expect(resource.subscribed?(user, project)).to be_falsey
+      it 'returns false when a subcription exists and subscribed is false' do
+        resource.subscriptions.create(user: user_1, project: project, subscribed: false)
+
+        expect(resource.subscribed?(user_1, project)).to be_falsey
+      end
     end
   end
 
@@ -29,41 +49,80 @@ describe Subscribable, 'Subscribable' do
     end
 
     it 'returns the subscribed users' do
-      resource.subscriptions.create(user: user, project: project, subscribed: true)
+      user_2 = create(:user)
+      resource.subscriptions.create(user: user_1, subscribed: true)
+      resource.subscriptions.create(user: user_2, project: project, subscribed: true)
       resource.subscriptions.create(user: create(:user), project: project, subscribed: false)
 
-      expect(resource.subscribers(project)).to eq [user]
+      expect(resource.subscribers(project)).to contain_exactly(user_1, user_2)
     end
   end
 
   describe '#toggle_subscription' do
-    it 'toggles the current subscription state for the given user' do
-      expect(resource.subscribed?(user, project)).to be_falsey
+    context 'without project' do
+      it 'toggles the current subscription state for the given user' do
+        expect(resource.subscribed?(user_1)).to be_falsey
+
+        resource.toggle_subscription(user_1)
+
+        expect(resource.subscribed?(user_1)).to be_truthy
+      end
+    end
 
-      resource.toggle_subscription(user, project)
+    context 'with project' do
+      it 'toggles the current subscription state for the given user' do
+        expect(resource.subscribed?(user_1, project)).to be_falsey
 
-      expect(resource.subscribed?(user, project)).to be_truthy
+        resource.toggle_subscription(user_1, project)
+
+        expect(resource.subscribed?(user_1, project)).to be_truthy
+      end
     end
   end
 
   describe '#subscribe' do
-    it 'subscribes the given user' do
-      expect(resource.subscribed?(user, project)).to be_falsey
+    context 'without project' do
+      it 'subscribes the given user' do
+        expect(resource.subscribed?(user_1)).to be_falsey
+
+        resource.subscribe(user_1)
+
+        expect(resource.subscribed?(user_1)).to be_truthy
+      end
+    end
+
+    context 'with project' do
+      it 'subscribes the given user' do
+        expect(resource.subscribed?(user_1, project)).to be_falsey
 
-      resource.subscribe(user, project)
+        resource.subscribe(user_1, project)
 
-      expect(resource.subscribed?(user, project)).to be_truthy
+        expect(resource.subscribed?(user_1, project)).to be_truthy
+      end
     end
   end
 
   describe '#unsubscribe' do
-    it 'unsubscribes the given current user' do
-      resource.subscriptions.create(user: user, project: project, subscribed: true)
-      expect(resource.subscribed?(user, project)).to be_truthy
+    context 'without project' do
+      it 'unsubscribes the given current user' do
+        resource.subscriptions.create(user: user_1, subscribed: true)
+        expect(resource.subscribed?(user_1)).to be_truthy
+
+        resource.unsubscribe(user_1)
+
+        expect(resource.subscribed?(user_1)).to be_falsey
+      end
+    end
+
+    context 'with project' do
+      it 'unsubscribes the given current user' do
+        resource.subscriptions.create(user: user_1, project: project, subscribed: true)
+        expect(resource.subscribed?(user_1, project)).to be_truthy
 
-      resource.unsubscribe(user, project)
+        resource.unsubscribe(user_1, project)
 
-      expect(resource.subscribed?(user, project)).to be_falsey
+        expect(resource.subscribed?(user_1, project)).to be_falsey
+      end
     end
   end
 end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index ab674958387..9ab112bb2ee 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -8,7 +8,6 @@ describe Subscription, models: true do
   end
 
   describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:subscribable) }
     it { is_expected.to validate_presence_of(:user) }
 
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 64e378d8328..8726c9eaa55 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -382,18 +382,21 @@ describe NotificationService, services: true do
         user_1 = create(:user)
         user_2 = create(:user)
         user_3 = create(:user)
+        user_4 = create(:user)
         label = create(:label, project: project, issues: [issue])
         group_label = create(:group_label, group: group, issues: [issue])
         issue.reload
         label.toggle_subscription(user_1, project)
         group_label.toggle_subscription(user_2, project)
         group_label.toggle_subscription(user_3, another_project)
+        group_label.toggle_subscription(user_4)
 
         notification.new_issue(issue, @u_disabled)
 
         should_email(user_1)
         should_email(user_2)
         should_not_email(user_3)
+        should_email(user_4)
       end
 
       context 'confidential issues' do
@@ -569,7 +572,8 @@ describe NotificationService, services: true do
       let(:label_1) { create(:label, project: project, title: 'Label 1', issues: [issue]) }
       let(:label_2) { create(:label, project: project, title: 'Label 2') }
       let!(:subscriber_to_group_label_1) { create(:user) { |u| group_label_1.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_1_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_2_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u) } }
       let!(:subscriber_to_group_label_2_on_another_project) { create(:user) { |u| group_label_2.toggle_subscription(u, another_project) } }
       let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
       let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
@@ -580,7 +584,8 @@ describe NotificationService, services: true do
         should_not_email(subscriber_to_label_1)
         should_not_email(subscriber_to_group_label_1)
         should_not_email(subscriber_to_group_label_2_on_another_project)
-        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_1_to_group_label_2)
+        should_email(subscriber_2_to_group_label_2)
         should_email(subscriber_to_label_2)
       end
 
@@ -599,7 +604,8 @@ describe NotificationService, services: true do
         should_not_email(subscriber_to_label_1)
         should_not_email(subscriber_to_group_label_1)
         should_not_email(subscriber_to_group_label_2_on_another_project)
-        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_1_to_group_label_2)
+        should_email(subscriber_2_to_group_label_2)
         should_email(subscriber_to_label_2)
       end
 
@@ -784,17 +790,20 @@ describe NotificationService, services: true do
         user_1 = create(:user)
         user_2 = create(:user)
         user_3 = create(:user)
+        user_4 = create(:user)
         label = create(:label, project: project, merge_requests: [merge_request])
         group_label = create(:group_label, group: group, merge_requests: [merge_request])
         label.toggle_subscription(user_1, project)
         group_label.toggle_subscription(user_2, project)
         group_label.toggle_subscription(user_3, another_project)
+        group_label.toggle_subscription(user_4)
 
         notification.new_merge_request(merge_request, @u_disabled)
 
         should_email(user_1)
         should_email(user_2)
         should_not_email(user_3)
+        should_email(user_4)
       end
 
       context 'participating' do
@@ -893,7 +902,8 @@ describe NotificationService, services: true do
       let(:label_1) { create(:label, project: project, title: 'Label 1', merge_requests: [merge_request]) }
       let(:label_2) { create(:label, project: project, title: 'Label 2') }
       let!(:subscriber_to_group_label_1) { create(:user) { |u| group_label_1.toggle_subscription(u, project) } }
-      let!(:subscriber_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_1_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u, project) } }
+      let!(:subscriber_2_to_group_label_2) { create(:user) { |u| group_label_2.toggle_subscription(u) } }
       let!(:subscriber_to_group_label_2_on_another_project) { create(:user) { |u| group_label_2.toggle_subscription(u, another_project) } }
       let!(:subscriber_to_label_1) { create(:user) { |u| label_1.toggle_subscription(u, project) } }
       let!(:subscriber_to_label_2) { create(:user) { |u| label_2.toggle_subscription(u, project) } }
@@ -904,7 +914,8 @@ describe NotificationService, services: true do
         should_not_email(subscriber_to_label_1)
         should_not_email(subscriber_to_group_label_1)
         should_not_email(subscriber_to_group_label_2_on_another_project)
-        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_1_to_group_label_2)
+        should_email(subscriber_2_to_group_label_2)
         should_email(subscriber_to_label_2)
       end
 
@@ -923,7 +934,8 @@ describe NotificationService, services: true do
         should_not_email(subscriber_to_label_1)
         should_not_email(subscriber_to_group_label_1)
         should_not_email(subscriber_to_group_label_2_on_another_project)
-        should_email(subscriber_to_group_label_2)
+        should_email(subscriber_1_to_group_label_2)
+        should_email(subscriber_2_to_group_label_2)
         should_email(subscriber_to_label_2)
       end
     end
-- 
cgit v1.2.1


From 198fe1bfc281ed465b94bb0b0a077f607d3d9fc7 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 14 Nov 2016 20:42:44 -0200
Subject: Add toggle_subscription action to Groups::LabelsController

---
 spec/controllers/groups/labels_controller_spec.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 spec/controllers/groups/labels_controller_spec.rb

(limited to 'spec')

diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
new file mode 100644
index 00000000000..899d8ebd12b
--- /dev/null
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Groups::LabelsController do
+  let(:group) { create(:group) }
+  let(:user)  { create(:user) }
+
+  before do
+    group.add_owner(user)
+
+    sign_in(user)
+  end
+
+  describe 'POST #toggle_subscription' do
+    it 'allows user to toggle subscription on group labels' do
+      label = create(:group_label, group: group)
+
+      post :toggle_subscription, group_id: group.to_param, id: label.to_param
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
-- 
cgit v1.2.1


From 23f45e842cbe366c1992b7cf1472a4039b9a69ea Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 16 Nov 2016 18:23:15 -0200
Subject: Add feature spec for labels subscription

---
 spec/features/projects/labels/subscription_spec.rb | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 spec/features/projects/labels/subscription_spec.rb

(limited to 'spec')

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
-- 
cgit v1.2.1