diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-01 00:14:53 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-17 15:10:13 -0200 |
commit | 091efb315296306fd8c8d7c109ad6df77e7f28d5 (patch) | |
tree | ca78c1e5c9229eed679657cc26cfdfa0cb94c8c2 | |
parent | 48d851d2015c3cb901498455862176eb15be3a0f (diff) | |
download | gitlab-ce-091efb315296306fd8c8d7c109ad6df77e7f28d5.tar.gz |
Fix specs to pass a project when creating subscriptions
-rw-r--r-- | spec/controllers/sent_notifications_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/concerns/issuable_spec.rb | 10 | ||||
-rw-r--r-- | spec/services/issuable/bulk_update_service_spec.rb | 2 |
3 files changed, 9 insertions, 7 deletions
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 |