Skip to content

G
gitlab-ce
Commit 9fe93e3c authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into 'master' 

Don't show an "Unsubscribe" link in snippet comment notifications

Closes #23888

See merge request gitlab-org/gitlab-ce!14764
parents 8ed259b0 3acbbb1a
Hide whitespace changes
Inline Side-by-side
Showing with 390 additions and 234 deletions
app/models/sent_notification.rb
View file @ 9fe93e3c
...@@ -53,13 +53,17 @@ class SentNotification < ActiveRecord::Base ...@@ -53,13 +53,17 @@ class SentNotification < ActiveRecord::Base
end end
def unsubscribable? def unsubscribable?
!for_commit? !(for_commit? || for_snippet?)
end end
def for_commit? def for_commit?
noteable_type == "Commit" noteable_type == "Commit"
end end
def for_snippet?
noteable_type.end_with?('Snippet')
end
def noteable def noteable
if for_commit? if for_commit?
project.commit(commit_id) rescue nil project.commit(commit_id) rescue nil
......
changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml 0 → 100644
View file @ 9fe93e3c
---
title: Don't show an "Unsubscribe" link in snippet comment notifications
merge_request: 14764
author:
type: fixed
spec/mailers/notify_spec.rb
View file @ 9fe93e3c
...@@ -28,319 +28,334 @@ describe Notify do ...@@ -28,319 +28,334 @@ describe Notify do
end end
def have_referable_subject(referable, reply: false) def have_referable_subject(referable, reply: false)
prefix = referable.project.name if referable.project prefix = referable.project ? "#{referable.project.name} | " : ''
prefix = "Re: #{prefix}" if reply prefix.prepend('Re: ') if reply
suffix = "#{referable.title} (#{referable.to_reference})" suffix = "#{referable.title} (#{referable.to_reference})"
have_subject [prefix, suffix].compact.join(' | ') have_subject [prefix, suffix].compact.join
end end
context 'for a project' do context 'for a project' do
describe 'items that are assignable, the email' do shared_examples 'an assignee email' do
let(:previous_assignee) { create(:user, name: 'Previous Assignee') } it 'is sent to the assignee as the author' do
sender = subject.header[:from].addrs.first
aggregate_failures do
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
expect(subject).to deliver_to(assignee.email)
end
end
end
shared_examples 'an assignee email' do context 'for issues' do
it 'is sent to the assignee as the author' do describe 'that are new' do
sender = subject.header[:from].addrs.first subject { described_class.new_issue_email(issue.assignees.first.id, issue.id) }
it_behaves_like 'an assignee email'
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do
let(:model) { issue }
end
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject and body' do
aggregate_failures do aggregate_failures do
expect(sender.display_name).to eq(current_user.name) is_expected.to have_referable_subject(issue)
expect(sender.address).to eq(gitlab_sender) is_expected.to have_body_text(project_issue_path(project, issue))
expect(subject).to deliver_to(assignee.email)
end end
end end
end
context 'for issues' do it 'contains the description' do
describe 'that are new' do is_expected.to have_html_escaped_body_text issue.description
subject { described_class.new_issue_email(issue.assignees.first.id, issue.id) } end
it_behaves_like 'an assignee email' context 'when enabled email_author_in_body' do
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do before do
let(:model) { issue } stub_application_setting(email_author_in_body: true)
end
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread'
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(issue)
is_expected.to have_body_text(project_issue_path(project, issue))
end
end end
it 'contains the description' do it 'contains a link to note author' do
is_expected.to have_html_escaped_body_text issue.description is_expected.to have_html_escaped_body_text(issue.author_name)
is_expected.to have_body_text 'created an issue:'
end end
end
end
context 'when enabled email_author_in_body' do describe 'that are reassigned' do
before do let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
stub_application_setting(email_author_in_body: true) subject { described_class.reassigned_issue_email(recipient.id, issue.id, [previous_assignee.id], current_user.id) }
end
it 'contains a link to note author' do it_behaves_like 'a multiple recipients email'
is_expected.to have_html_escaped_body_text(issue.author_name) it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
is_expected.to have_body_text 'created an issue:' let(:model) { issue }
end
end
end end
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread'
describe 'that have been reassigned' do it 'is sent as the author' do
subject { described_class.reassigned_issue_email(recipient.id, issue.id, [previous_assignee.id], current_user.id) } sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it_behaves_like 'a multiple recipients email' it 'has the correct subject and body' do
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do aggregate_failures do
let(:model) { issue } is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_html_escaped_body_text(previous_assignee.name)
is_expected.to have_html_escaped_body_text(assignee.name)
is_expected.to have_body_text(project_issue_path(project, issue))
end end
it_behaves_like 'it should show Gmail Actions View Issue link' end
it_behaves_like 'an unsubscribeable thread' end
it 'is sent as the author' do describe 'that have been relabeled' do
sender = subject.header[:from].addrs[0] subject { described_class.relabeled_issue_email(recipient.id, issue.id, %w[foo bar baz], current_user.id) }
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject and body' do it_behaves_like 'a multiple recipients email'
aggregate_failures do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
is_expected.to have_referable_subject(issue, reply: true) let(:model) { issue }
is_expected.to have_html_escaped_body_text(previous_assignee.name)
is_expected.to have_html_escaped_body_text(assignee.name)
is_expected.to have_body_text(project_issue_path(project, issue))
end
end
end end
it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'a user cannot unsubscribe through footer link'
it_behaves_like 'an email with a labels subscriptions link in its footer'
describe 'that have been relabeled' do it 'is sent as the author' do
subject { described_class.relabeled_issue_email(recipient.id, issue.id, %w[foo bar baz], current_user.id) } sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it_behaves_like 'a multiple recipients email' it 'has the correct subject and body' do
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do aggregate_failures do
let(:model) { issue } is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_body_text('foo, bar, and baz')
is_expected.to have_body_text(project_issue_path(project, issue))
end end
it_behaves_like 'it should show Gmail Actions View Issue link' end
it_behaves_like 'a user cannot unsubscribe through footer link'
it_behaves_like 'an email with a labels subscriptions link in its footer'
it 'is sent as the author' do context 'with a preferred language' do
sender = subject.header[:from].addrs[0] before do
expect(sender.display_name).to eq(current_user.name) Gitlab::I18n.locale = :es
expect(sender.address).to eq(gitlab_sender)
end end
it 'has the correct subject and body' do after do
aggregate_failures do Gitlab::I18n.use_default_locale
is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_body_text('foo, bar, and baz')
is_expected.to have_body_text(project_issue_path(project, issue))
end
end end
context 'with a preferred language' do it 'always generates the email using the default language' do
before do is_expected.to have_body_text('foo, bar, and baz')
Gitlab::I18n.locale = :es
end
after do
Gitlab::I18n.use_default_locale
end
it 'always generates the email using the default language' do
is_expected.to have_body_text('foo, bar, and baz')
end
end end
end end
end
describe 'status changed' do describe 'status changed' do
let(:status) { 'closed' } let(:status) { 'closed' }
subject { described_class.issue_status_changed_email(recipient.id, issue.id, status, current_user.id) } subject { described_class.issue_status_changed_email(recipient.id, issue.id, status, current_user.id) }
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
let(:model) { issue } let(:model) { issue }
end end
it_behaves_like 'it should show Gmail Actions View Issue link' it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread' it_behaves_like 'an unsubscribeable thread'
it 'is sent as the author' do it 'is sent as the author' do
sender = subject.header[:from].addrs[0] sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name) expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender) expect(sender.address).to eq(gitlab_sender)
end end
it 'has the correct subject and body' do it 'has the correct subject and body' do
aggregate_failures do aggregate_failures do
is_expected.to have_referable_subject(issue, reply: true) is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_body_text(status) is_expected.to have_body_text(status)
is_expected.to have_html_escaped_body_text(current_user.name) is_expected.to have_html_escaped_body_text(current_user.name)
is_expected.to have_body_text(project_issue_path project, issue) is_expected.to have_body_text(project_issue_path project, issue)
end
end end
end end
end
describe 'moved to another project' do describe 'moved to another project' do
let(:new_issue) { create(:issue) } let(:new_issue) { create(:issue) }
subject { described_class.issue_moved_email(recipient, issue, new_issue, current_user) } subject { described_class.issue_moved_email(recipient, issue, new_issue, current_user) }
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
let(:model) { issue } let(:model) { issue }
end end
it_behaves_like 'it should show Gmail Actions View Issue link' it_behaves_like 'it should show Gmail Actions View Issue link'
it_behaves_like 'an unsubscribeable thread' it_behaves_like 'an unsubscribeable thread'
it 'contains description about action taken' do it 'contains description about action taken' do
is_expected.to have_body_text 'Issue was moved to another project' is_expected.to have_body_text 'Issue was moved to another project'
end end
it 'has the correct subject and body' do it 'has the correct subject and body' do
new_issue_url = project_issue_path(new_issue.project, new_issue) new_issue_url = project_issue_path(new_issue.project, new_issue)
aggregate_failures do aggregate_failures do
is_expected.to have_referable_subject(issue, reply: true) is_expected.to have_referable_subject(issue, reply: true)
is_expected.to have_body_text(new_issue_url) is_expected.to have_body_text(new_issue_url)
is_expected.to have_body_text(project_issue_path(project, issue)) is_expected.to have_body_text(project_issue_path(project, issue))
end
end end
end end
end end
end
context 'for merge requests' do context 'for merge requests' do
describe 'that are new' do describe 'that are new' do
subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) } subject { described_class.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
it_behaves_like 'an assignee email'
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do
let(:model) { merge_request }
end
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it_behaves_like 'an assignee email' it 'has the correct subject and body' do
it_behaves_like 'an email starting a new thread with reply-by-email enabled' do aggregate_failures do
let(:model) { merge_request } is_expected.to have_referable_subject(merge_request)
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
is_expected.to have_body_text(merge_request.source_branch)
is_expected.to have_body_text(merge_request.target_branch)
end end
it_behaves_like 'it should show Gmail Actions View Merge request link' end
it_behaves_like 'an unsubscribeable thread'
it 'contains the description' do
it 'has the correct subject and body' do is_expected.to have_html_escaped_body_text merge_request.description
aggregate_failures do end
is_expected.to have_referable_subject(merge_request)
is_expected.to have_body_text(project_merge_request_path(project, merge_request)) context 'when enabled email_author_in_body' do
is_expected.to have_body_text(merge_request.source_branch) before do
is_expected.to have_body_text(merge_request.target_branch) stub_application_setting(email_author_in_body: true)
end
end end
it 'contains the description' do it 'contains a link to note author' do
is_expected.to have_html_escaped_body_text merge_request.description is_expected.to have_html_escaped_body_text merge_request.author_name
is_expected.to have_body_text 'created a merge request:'
end end
end
end
context 'when enabled email_author_in_body' do describe 'that are reassigned' do
before do let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
stub_application_setting(email_author_in_body: true) subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
end
it 'contains a link to note author' do it_behaves_like 'a multiple recipients email'
is_expected.to have_html_escaped_body_text merge_request.author_name it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
is_expected.to have_body_text 'created a merge request:' let(:model) { merge_request }
end
end
end end
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like "an unsubscribeable thread"
describe 'that are reassigned' do it 'is sent as the author' do
subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) } sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it_behaves_like 'a multiple recipients email' it 'has the correct subject and body' do
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do aggregate_failures do
let(:model) { merge_request } is_expected.to have_referable_subject(merge_request, reply: true)
is_expected.to have_html_escaped_body_text(previous_assignee.name)
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
is_expected.to have_html_escaped_body_text(assignee.name)
end end
it_behaves_like 'it should show Gmail Actions View Merge request link' end
it_behaves_like "an unsubscribeable thread" end
it 'is sent as the author' do describe 'that have been relabeled' do
sender = subject.header[:from].addrs[0] subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) }
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject and body' do it_behaves_like 'a multiple recipients email'
aggregate_failures do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
is_expected.to have_referable_subject(merge_request, reply: true) let(:model) { merge_request }
is_expected.to have_html_escaped_body_text(previous_assignee.name)
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
is_expected.to have_html_escaped_body_text(assignee.name)
end
end
end end
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'a user cannot unsubscribe through footer link'
it_behaves_like 'an email with a labels subscriptions link in its footer'
describe 'that have been relabeled' do it 'is sent as the author' do
subject { described_class.relabeled_merge_request_email(recipient.id, merge_request.id, %w[foo bar baz], current_user.id) } sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it_behaves_like 'a multiple recipients email' it 'has the correct subject and body' do
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do is_expected.to have_referable_subject(merge_request, reply: true)
let(:model) { merge_request } is_expected.to have_body_text('foo, bar, and baz')
end is_expected.to have_body_text(project_merge_request_path(project, merge_request))
it_behaves_like 'it should show Gmail Actions View Merge request link' end
it_behaves_like 'a user cannot unsubscribe through footer link' end
it_behaves_like 'an email with a labels subscriptions link in its footer'
it 'is sent as the author' do describe 'status changed' do
sender = subject.header[:from].addrs[0] let(:status) { 'reopened' }
expect(sender.display_name).to eq(current_user.name) subject { described_class.merge_request_status_email(recipient.id, merge_request.id, status, current_user.id) }
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject and body' do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
let(:model) { merge_request }
end
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it 'is sent as the author' do
sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name)
expect(sender.address).to eq(gitlab_sender)
end
it 'has the correct subject and body' do
aggregate_failures do
is_expected.to have_referable_subject(merge_request, reply: true) is_expected.to have_referable_subject(merge_request, reply: true)
is_expected.to have_body_text('foo, bar, and baz') is_expected.to have_body_text(status)
is_expected.to have_html_escaped_body_text(current_user.name)
is_expected.to have_body_text(project_merge_request_path(project, merge_request)) is_expected.to have_body_text(project_merge_request_path(project, merge_request))
end end
end end
end
describe 'status changed' do describe 'that are merged' do
let(:status) { 'reopened' } let(:merge_author) { create(:user) }
subject { described_class.merge_request_status_email(recipient.id, merge_request.id, status, current_user.id) } subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do it_behaves_like 'a multiple recipients email'
let(:model) { merge_request } it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
end let(:model) { merge_request }
it_behaves_like 'it should show Gmail Actions View Merge request link' end
it_behaves_like 'an unsubscribeable thread' it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it 'is sent as the author' do it 'is sent as the merge author' do
sender = subject.header[:from].addrs[0] sender = subject.header[:from].addrs[0]
expect(sender.display_name).to eq(current_user.name) expect(sender.display_name).to eq(merge_author.name)
expect(sender.address).to eq(gitlab_sender) expect(sender.address).to eq(gitlab_sender)
end end
it 'has the correct subject and body' do it 'has the correct subject and body' do
aggregate_failures do aggregate_failures do
is_expected.to have_referable_subject(merge_request, reply: true) is_expected.to have_referable_subject(merge_request, reply: true)
is_expected.to have_body_text(status) is_expected.to have_body_text('merged')
is_expected.to have_html_escaped_body_text(current_user.name) is_expected.to have_body_text(project_merge_request_path(project, merge_request))
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
end
end end
end end
end
end
describe 'that are merged' do context 'for snippet notes' do
let(:merge_author) { create(:user) } let(:project_snippet) { create(:project_snippet, project: project) }
subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) } let(:project_snippet_note) { create(:note_on_project_snippet, project: project, noteable: project_snippet) }
it_behaves_like 'a multiple recipients email' subject { described_class.note_snippet_email(project_snippet_note.author_id, project_snippet_note.id) }
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
let(:model) { merge_request }
end
it_behaves_like 'it should show Gmail Actions View Merge request link'
it_behaves_like 'an unsubscribeable thread'
it 'is sent as the merge author' do it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
sender = subject.header[:from].addrs[0] let(:model) { project_snippet }
expect(sender.display_name).to eq(merge_author.name) end
expect(sender.address).to eq(gitlab_sender) it_behaves_like 'a user cannot unsubscribe through footer link'
end
it 'has the correct subject and body' do it 'has the correct subject and body' do
aggregate_failures do is_expected.to have_referable_subject(project_snippet, reply: true)
is_expected.to have_referable_subject(merge_request, reply: true) is_expected.to have_html_escaped_body_text project_snippet_note.note
is_expected.to have_body_text('merged')
is_expected.to have_body_text(project_merge_request_path(project, merge_request))
end
end
end
end end
end end
...@@ -1239,4 +1254,18 @@ describe Notify do ...@@ -1239,4 +1254,18 @@ describe Notify do
end end
end end
end end
context 'for personal snippet notes' do
let(:personal_snippet) { create(:personal_snippet) }
let(:personal_snippet_note) { create(:note_on_personal_snippet, noteable: personal_snippet) }
subject { described_class.note_personal_snippet_email(personal_snippet_note.author_id, personal_snippet_note.id) }
it_behaves_like 'a user cannot unsubscribe through footer link'
it 'has the correct subject and body' do
is_expected.to have_referable_subject(personal_snippet, reply: true)
is_expected.to have_html_escaped_body_text personal_snippet_note.note
end
end
end end
spec/models/sent_notification_spec.rb
View file @ 9fe93e3c
require 'spec_helper' require 'spec_helper'
describe SentNotification do describe SentNotification do
set(:user) { create(:user) }
set(:project) { create(:project) }
describe 'validation' do describe 'validation' do
describe 'note validity' do describe 'note validity' do
context "when the project doesn't match the noteable's project" do context "when the project doesn't match the noteable's project" do
...@@ -34,7 +37,6 @@ describe SentNotification do ...@@ -34,7 +37,6 @@ describe SentNotification do
end end
describe '.record' do describe '.record' do
let(:user) { create(:user) }
let(:issue) { create(:issue) } let(:issue) { create(:issue) }
it 'creates a new SentNotification' do it 'creates a new SentNotification' do
...@@ -43,7 +45,6 @@ describe SentNotification do ...@@ -43,7 +45,6 @@ describe SentNotification do
end end
describe '.record_note' do describe '.record_note' do
let(:user) { create(:user) }
let(:note) { create(:diff_note_on_merge_request) } let(:note) { create(:diff_note_on_merge_request) }
it 'creates a new SentNotification' do it 'creates a new SentNotification' do
...@@ -51,6 +52,123 @@ describe SentNotification do ...@@ -51,6 +52,123 @@ describe SentNotification do
end end
end end
describe '#unsubscribable?' do
shared_examples 'an unsubscribable notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for #{noteable_type}" do
it { expect(subject).to be_unsubscribable }
end
end
shared_examples 'a non-unsubscribable notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for a #{noteable_type}" do
it { expect(subject).not_to be_unsubscribable }
end
end
it_behaves_like 'an unsubscribable notification', 'issue' do
let(:noteable) { create(:issue, project: project) }
end
it_behaves_like 'an unsubscribable notification', 'merge request' do
let(:noteable) { create(:merge_request, source_project: project) }
end
it_behaves_like 'a non-unsubscribable notification', 'commit' do
let(:project) { create(:project, :repository) }
let(:noteable) { project.commit }
end
it_behaves_like 'a non-unsubscribable notification', 'personal snippet' do
let(:noteable) { create(:personal_snippet, project: project) }
end
it_behaves_like 'a non-unsubscribable notification', 'project snippet' do
let(:noteable) { create(:project_snippet, project: project) }
end
end
describe '#for_commit?' do
shared_examples 'a commit notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for #{noteable_type}" do
it { expect(subject).to be_for_commit }
end
end
shared_examples 'a non-commit notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for a #{noteable_type}" do
it { expect(subject).not_to be_for_commit }
end
end
it_behaves_like 'a non-commit notification', 'issue' do
let(:noteable) { create(:issue, project: project) }
end
it_behaves_like 'a non-commit notification', 'merge request' do
let(:noteable) { create(:merge_request, source_project: project) }
end
it_behaves_like 'a commit notification', 'commit' do
let(:project) { create(:project, :repository) }
let(:noteable) { project.commit }
end
it_behaves_like 'a non-commit notification', 'personal snippet' do
let(:noteable) { create(:personal_snippet, project: project) }
end
it_behaves_like 'a non-commit notification', 'project snippet' do
let(:noteable) { create(:project_snippet, project: project) }
end
end
describe '#for_snippet?' do
shared_examples 'a snippet notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for #{noteable_type}" do
it { expect(subject).to be_for_snippet }
end
end
shared_examples 'a non-snippet notification' do |noteable_type|
subject { described_class.record(noteable, user.id) }
context "for a #{noteable_type}" do
it { expect(subject).not_to be_for_snippet }
end
end
it_behaves_like 'a non-snippet notification', 'issue' do
let(:noteable) { create(:issue, project: project) }
end
it_behaves_like 'a non-snippet notification', 'merge request' do
let(:noteable) { create(:merge_request, source_project: project) }
end
it_behaves_like 'a non-snippet notification', 'commit' do
let(:project) { create(:project, :repository) }
let(:noteable) { project.commit }
end
it_behaves_like 'a snippet notification', 'personal snippet' do
let(:noteable) { create(:personal_snippet, project: project) }
end
it_behaves_like 'a snippet notification', 'project snippet' do
let(:noteable) { create(:project_snippet, project: project) }
end
end
describe '#create_reply' do describe '#create_reply' do
context 'for issue' do context 'for issue' do
let(:issue) { create(:issue) } let(:issue) { create(:issue) }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7