From bf9c4a7828c3c491a1f0cf3f33517806bb06c904 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 24 Apr 2017 15:26:06 -0400 Subject: [PATCH] FEATURE: secure_email site setting to prevent data going out in email --- app/helpers/email_helper.rb | 38 ++++++++ app/jobs/scheduled/enqueue_digest_emails.rb | 7 +- app/mailers/invite_mailer.rb | 9 +- app/mailers/user_notifications.rb | 20 ++++- app/models/post.rb | 15 +++- app/models/topic.rb | 8 +- app/views/email/_mailing_list_post.html.erb | 5 ++ .../email/_secure_mailing_list_post.html.erb | 4 + app/views/email/notification.html.erb | 44 +++++----- .../user_notifications/mailing_list.html.erb | 74 ++++++++-------- .../user_notifications/mailing_list.text.erb | 22 ++--- config/locales/server.en.yml | 4 + config/site_settings.yml | 1 + lib/email/sender.rb | 9 +- spec/jobs/enqueue_digest_emails_spec.rb | 15 +++- spec/mailers/invite_mailer_spec.rb | 9 ++ spec/mailers/user_notifications_spec.rb | 86 ++++++++++++++++++- 17 files changed, 281 insertions(+), 89 deletions(-) create mode 100644 app/helpers/email_helper.rb create mode 100644 app/views/email/_mailing_list_post.html.erb create mode 100644 app/views/email/_secure_mailing_list_post.html.erb diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb new file mode 100644 index 00000000000..c8e5cd9f8b6 --- /dev/null +++ b/app/helpers/email_helper.rb @@ -0,0 +1,38 @@ +module EmailHelper + + def mailing_list_topic(topic, post_count) + render( + partial: partial_for("mailing_list_post"), + locals: { topic: topic, post_count: post_count } + ) + end + + def mailing_list_topic_text(topic) + url, title = extract_details(topic) + raw(@markdown_linker.create(title, url)) + end + + def private_topic_title(topic) + I18n.t("system_messages.secure_topic_title", id: topic.id) + end + + def email_topic_link(topic) + url, title = extract_details(topic) + raw "#{title}" + end + + protected + + def extract_details(topic) + if SiteSetting.private_email? + [topic.slugless_url, private_topic_title(topic)] + else + [topic.relative_url, format_topic_title(topic.title)] + end + end + + def partial_for(name) + SiteSetting.private_email? ? "email/secure_#{name}" : "email/#{name}" + end + +end diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb index bab41fb1422..1bd4ed4fdfb 100644 --- a/app/jobs/scheduled/enqueue_digest_emails.rb +++ b/app/jobs/scheduled/enqueue_digest_emails.rb @@ -5,10 +5,9 @@ module Jobs every 30.minutes def execute(args) - unless SiteSetting.disable_digest_emails? - target_user_ids.each do |user_id| - Jobs.enqueue(:user_email, type: :digest, user_id: user_id) - end + return if SiteSetting.disable_digest_emails? || SiteSetting.private_email? + target_user_ids.each do |user_id| + Jobs.enqueue(:user_email, type: :digest, user_id: user_id) end end diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb index 346507326fc..e39b71ce0d5 100644 --- a/app/mailers/invite_mailer.rb +++ b/app/mailers/invite_mailer.rb @@ -5,6 +5,7 @@ class InviteMailer < ActionMailer::Base class UserNotificationRenderer < ActionView::Base include UserNotificationsHelper + include EmailHelper end def send_invite(invite, custom_message=nil) @@ -30,12 +31,18 @@ class InviteMailer < ActionMailer::Base template = 'custom_invite_mailer' end + topic_title = first_topic.try(:title) + if SiteSetting.private_email? + topic_title = I18n.t("system_messages.secure_topic_title", id: first_topic.id) + topic_excerpt = "" + end + build_email(invite.email, template: template, invitee_name: invitee_name, site_domain_name: Discourse.current_hostname, invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}", - topic_title: first_topic.try(:title), + topic_title: topic_title, topic_excerpt: topic_excerpt, site_description: SiteSetting.site_description, site_title: SiteSetting.title, diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 586c3a71632..947680b4ac7 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -5,7 +5,7 @@ require_dependency 'age_words' class UserNotifications < ActionMailer::Base include UserNotificationsHelper include ApplicationHelper - helper :application + helper :application, :email default charset: 'UTF-8' include Email::BuildEmailHelper @@ -284,10 +284,12 @@ class UserNotifications < ActionMailer::Base class UserNotificationRenderer < ActionView::Base include UserNotificationsHelper + include EmailHelper end def self.get_context_posts(post, topic_user, user) - if user.user_option.email_previous_replies == UserOption.previous_replies_type[:never] + if (user.user_option.email_previous_replies == UserOption.previous_replies_type[:never]) || + SiteSetting.private_email? return [] end @@ -349,6 +351,7 @@ class UserNotifications < ActionMailer::Base def send_notification_email(opts) post = opts[:post] title = opts[:title] + allow_reply_by_email = opts[:allow_reply_by_email] use_site_subject = opts[:use_site_subject] add_re_to_subject = opts[:add_re_to_subject] && post.post_number > 1 @@ -377,6 +380,10 @@ class UserNotifications < ActionMailer::Base show_category_in_subject = nil end + if SiteSetting.private_email? + title = I18n.t("system_messages.private_topic_title", id: post.topic_id) + end + context = "" tu = TopicUser.get(post.topic_id, user) context_posts = self.class.get_context_posts(post, tu, user) @@ -418,7 +425,12 @@ class UserNotifications < ActionMailer::Base .count) >= (SiteSetting.max_emails_per_day_per_user-1) in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to - message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : ""); + if SiteSetting.private_email? + message = I18n.t('system_messages.contents_hidden') + else + message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : ""); + end + unless translation_override_exists html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( @@ -438,7 +450,7 @@ class UserNotifications < ActionMailer::Base topic_title: gsub_emoji_to_unicode(title), topic_title_url_encoded: title ? URI.encode(title) : title, message: message, - url: post.url, + url: post.url(without_slug: SiteSetting.private_email?), post_id: post.id, topic_id: post.topic_id, context: context, diff --git a/app/models/post.rb b/app/models/post.rb index 2ed6d3e0650..13d88aec1b8 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -400,9 +400,11 @@ class Post < ActiveRecord::Base "#{Discourse.base_url}#{url}" end - def url + def url(opts=nil) + opts ||= {} + if topic - Post.url(topic.slug, topic.id, post_number) + Post.url(topic.slug, topic.id, post_number, opts) else "/404" end @@ -412,8 +414,13 @@ class Post < ActiveRecord::Base "#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.create_key_for(user, self)}" end - def self.url(slug, topic_id, post_number) - "/t/#{slug}/#{topic_id}/#{post_number}" + def self.url(slug, topic_id, post_number, opts=nil) + opts ||= {} + + result = "/t/" + result << "#{slug}/" unless !!opts[:without_slug] + + "#{result}#{topic_id}/#{post_number}" end def self.urls(post_ids) diff --git a/app/models/topic.rb b/app/models/topic.rb index a63100fd13c..abda4fa6e02 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -890,11 +890,17 @@ SQL end def self.relative_url(id, slug, post_number=nil) - url = "#{Discourse.base_uri}/t/#{slug}/#{id}" + url = "#{Discourse.base_uri}/t/" + url << "#{slug}/" if slug.present? + url << id.to_s url << "/#{post_number}" if post_number.to_i > 1 url end + def slugless_url(post_number=nil) + Topic.relative_url(id, nil, post_number) + end + def relative_url(post_number=nil) Topic.relative_url(id, slug, post_number) end diff --git a/app/views/email/_mailing_list_post.html.erb b/app/views/email/_mailing_list_post.html.erb new file mode 100644 index 00000000000..43d09820e2e --- /dev/null +++ b/app/views/email/_mailing_list_post.html.erb @@ -0,0 +1,5 @@ +
  • + <%= raw format_topic_title(topic.title) %> + <%= post_count %> + <%= category_badge(topic.category, inline_style: true, absolute_url: true) %> +
    • diff --git a/app/views/email/_secure_mailing_list_post.html.erb b/app/views/email/_secure_mailing_list_post.html.erb new file mode 100644 index 00000000000..418a6b79fab --- /dev/null +++ b/app/views/email/_secure_mailing_list_post.html.erb @@ -0,0 +1,4 @@ +
  • + <%= email_topic_link(topic) %> + <%= post_count %> +
    • diff --git a/app/views/email/notification.html.erb b/app/views/email/notification.html.erb index 5e33b4625ec..5809973d56b 100644 --- a/app/views/email/notification.html.erb +++ b/app/views/email/notification.html.erb @@ -2,28 +2,32 @@
    %{header_instructions}
    - <%= render partial: 'email/post', locals: { post: post, use_excerpt: false } %> + <%- if SiteSetting.private_email? %> +

    <%= t('system_messages.contents_hidden') %>

    + <% else %> + <%= render partial: 'email/post', locals: { post: post, use_excerpt: false } %> - <% if in_reply_to_post.present? || context_posts.present? %> -
    %{respond_instructions}
    -
    - <% end %> - - <% if in_reply_to_post.present? %> -

    <%= t "user_notifications.in_reply_to" %>

    - <%= render partial: 'email/post', locals: { post: in_reply_to_post, use_excerpt: true} %> - <% end %> - - <% if context_posts.present? %> -

    <%= t "user_notifications.previous_discussion" %>

    - <% context_posts.each do |p| %> - <%= render partial: 'email/post', locals: { post: p, use_excerpt: false } %> + <% if in_reply_to_post.present? || context_posts.present? %> +
    %{respond_instructions}
    +
    <% end %> - <% end %> - <% if reached_limit %> -
    -
    <%= t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user %>
    + <% if in_reply_to_post.present? %> +

    <%= t "user_notifications.in_reply_to" %>

    + <%= render partial: 'email/post', locals: { post: in_reply_to_post, use_excerpt: true} %> + <% end %> + + <% if context_posts.present? %> +

    <%= t "user_notifications.previous_discussion" %>

    + <% context_posts.each do |p| %> + <%= render partial: 'email/post', locals: { post: p, use_excerpt: false } %> + <% end %> + <% end %> + + <% if reached_limit %> +
    +
    <%= t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user %>
    + <% end %> <% end %>
    %{respond_instructions}
    @@ -33,7 +37,7 @@
    - +
    diff --git a/app/views/user_notifications/mailing_list.html.erb b/app/views/user_notifications/mailing_list.html.erb index 006098165ac..7b91858c625 100644 --- a/app/views/user_notifications/mailing_list.html.erb +++ b/app/views/user_notifications/mailing_list.html.erb @@ -21,21 +21,13 @@

    <%= t('user_notifications.mailing_list.new_topics') %>

    <%= t('user_notifications.mailing_list.topic_updates') %>

    @@ -46,40 +38,42 @@

    - <%= raw format_topic_title(topic.title) %> + <%= email_topic_link(topic) %>

    - - - <% @posts_by_topic[topic].each do |post| %> -
    - -

    - - <%- if show_username_on_post(post) %> - <%= post.user.username %> - <% end %> + <%- unless SiteSetting.private_email? %> + + + <% @posts_by_topic[topic].each do |post| %> +

    + +

    + + <%- if show_username_on_post(post) %> + <%= post.user.username %> + <% end %> - <%- if show_name_on_post(post) %> - - <%= post.user.name %> - <% end %> - + <%- if show_name_on_post(post) %> + - <%= post.user.name %> + <% end %> + - - - <%= I18n.l(post.created_at, format: :long) %> -

    - <%= raw format_for_email(post, false) %> -
    -
    - <% end %> - <%= t('user_notifications.mailing_list.view_this_topic') %> - - - - - <%= t('user_notifications.mailing_list.back_to_top') %> - - + - + <%= I18n.l(post.created_at, format: :long) %> +

    + <%= raw format_for_email(post, false) %> +
    +
    + <% end %> + <%= t('user_notifications.mailing_list.view_this_topic') %> + + + + + <%= t('user_notifications.mailing_list.back_to_top') %> + + + <% end %> <% end %> diff --git a/app/views/user_notifications/mailing_list.text.erb b/app/views/user_notifications/mailing_list.text.erb index 5208a9f085f..dfe0fe16831 100644 --- a/app/views/user_notifications/mailing_list.text.erb +++ b/app/views/user_notifications/mailing_list.text.erb @@ -4,28 +4,30 @@ <%- if @new_topic_posts.keys.present? -%> ### <%= t 'user_notifications.mailing_list.new_topics' %> <%- @new_topic_posts.keys.each do |topic| %> - <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> + <%= mailing_list_topic_text(topic) %> <%- end -%> <%- end -%> <%- if @existing_topic_posts.keys.present? -%> ### <%= t 'user_notifications.mailing_list.new_topics' %> <%- @existing_topic_posts.keys.each do |topic| -%> - <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> + <%= mailing_list_topic_text(topic) %> <%= @existing_topic_posts[topic].length %> <%- end -%> <%- end -%> -------------------------------------------------------------------------------- -<%- @posts_by_topic.keys.each do |topic| %> - ### <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> +<%- unless SiteSetting.private_email? %> + <%- @posts_by_topic.keys.each do |topic| %> + ### <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %> - <%- @posts_by_topic[topic].each do |post| -%> - <%= post.user.name || post.user.username %> - <%= post.created_at %> --------------------------------------------------------------------------------- - <%= post.raw %> + <%- @posts_by_topic[topic].each do |post| -%> + <%= post.user.name || post.user.username %> - <%= post.created_at %> + -------------------------------------------------------------------------------- + <%= post.raw %> - - <%- end -%> + + <%- end -%> + <%- end %> <%- end %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 19c7d0880c0..efa660128be 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1336,6 +1336,7 @@ en: enable_forwarded_emails: "[BETA] Allow users to create a topic by forwarding an email in." always_show_trimmed_content: "Always show trimmed part of incoming emails. WARNING: might reveal email addresses." + private_email: "Don't include content from posts or topics in emails for extra privacy." manual_polling_enabled: "Push emails using the API for email replies." pop3_polling_enabled: "Poll via POP3 for email replies." @@ -1934,6 +1935,9 @@ en: other: "This topic is temporarily closed for %{count} hours due to a large number of community flags." system_messages: + secure_topic_title: "Topic #%{id}" + contents_hidden: "Please visit the post to see its contents." + post_hidden: title: "Post Hidden" subject_template: "Post hidden by community flags" diff --git a/config/site_settings.yml b/config/site_settings.yml index c978dc48ec9..6c916061601 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -701,6 +701,7 @@ email: default: "smime.p7s|signature.asc" enable_forwarded_emails: false always_show_trimmed_content: false + private_email: false files: max_image_size_kb: diff --git a/lib/email/sender.rb b/lib/email/sender.rb index cf9695583c3..db167a12dd7 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -130,7 +130,14 @@ module Email # https://www.ietf.org/rfc/rfc3834.txt @message.header['Precedence'] = 'list' @message.header['List-ID'] = list_id - @message.header['List-Archive'] = topic.url if topic + + if topic + if SiteSetting.private_email? + @message.header['List-Archive'] = "#{Discourse.base_url}#{topic.slugless_url}" + else + @message.header['List-Archive'] = topic.url + end + end end if reply_key.present? && @message.header['Reply-To'] =~ /\<([^\>]+)\>/ diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index 9d00e3dd4c5..acb3f16403d 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -6,7 +6,7 @@ describe Jobs::EnqueueDigestEmails do describe '#target_users' do context 'disabled digests' do - before { SiteSetting.stubs(:default_email_digest_frequency).returns(0) } + before { SiteSetting.default_email_digest_frequency = 0 } let!(:user_no_digests) { Fabricate(:active_user, last_emailed_at: 8.days.ago, last_seen_at: 10.days.ago) } it "doesn't return users with email disabled" do @@ -129,13 +129,24 @@ describe Jobs::EnqueueDigestEmails do end end + context "private email" do + before do + Jobs::EnqueueDigestEmails.any_instance.expects(:target_user_ids).never + SiteSetting.private_email = true + Jobs.expects(:enqueue).with(:user_email, type: :digest, user_id: user.id).never + end + it "doesn't return users with email disabled" do + Jobs::EnqueueDigestEmails.new.execute({}) + end + end + context "digest emails are disabled" do before do Jobs::EnqueueDigestEmails.any_instance.expects(:target_user_ids).never + SiteSetting.disable_digest_emails = true end it "does not enqueue the digest email job" do - SiteSetting.stubs(:disable_digest_emails?).returns(true) Jobs.expects(:enqueue).with(:user_email, type: :digest, user_id: user.id).never Jobs::EnqueueDigestEmails.new.execute({}) end diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb index 3dc8a007f11..68ce2b4a4a9 100644 --- a/spec/mailers/invite_mailer_spec.rb +++ b/spec/mailers/invite_mailer_spec.rb @@ -67,6 +67,7 @@ describe InviteMailer do it 'renders invite link' do expect(custom_invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}") end + end end end @@ -111,6 +112,14 @@ describe InviteMailer do it 'renders topic title' do expect(invite_mail.body.encoded).to match(topic.title) end + + it "respects the private_email setting" do + SiteSetting.private_email = true + + message = invite_mail + expect(message.body.to_s).not_to include(topic.title) + expect(message.body.to_s).not_to include(topic.slug) + end end context "custom invite message" do diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index 3cd4ca74b4e..f37d78d78dd 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -47,7 +47,10 @@ describe UserNotifications do user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:always]) expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(2) + SiteSetting.private_email = true + expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(0) end + end describe ".signup" do @@ -152,6 +155,15 @@ describe UserNotifications do expect(subject.html_part.body.to_s).to include old_topic.title expect(subject.html_part.body.to_s).to include whisper.cooked end + + it "hides details for private email" do + SiteSetting.private_email = true + + expect(subject.html_part.body.to_s).not_to include(topic.title) + expect(subject.html_part.body.to_s).not_to include(topic.slug) + expect(subject.text_part.body.to_s).not_to include(topic.title) + expect(subject.text_part.body.to_s).not_to include(topic.slug) + end end end @@ -291,8 +303,6 @@ describe UserNotifications do expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0) - - SiteSetting.enable_names = true SiteSetting.display_name_on_posts = true SiteSetting.prioritize_username_in_ux = false @@ -324,6 +334,21 @@ describe UserNotifications do expect(mail_html.scan(/>Bob Marley/).count).to eq(0) expect(mail_html.scan(/>bobmarley/).count).to eq(1) end + + it "doesn't include details when private_email is enabled" do + SiteSetting.private_email = true + mail = UserNotifications.user_replied( + response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + expect(mail.html_part.to_s).to_not include(response.raw) + expect(mail.html_part.to_s).to_not include(topic.url) + expect(mail.text_part.to_s).to_not include(response.raw) + expect(mail.text_part.to_s).to_not include(topic.url) + end end describe '.user_posted' do @@ -360,6 +385,19 @@ describe UserNotifications do tu = TopicUser.get(post.topic_id, response.user) expect(tu.last_emailed_post_number).to eq(response.post_number) end + + it "doesn't include details when private_email is enabled" do + SiteSetting.private_email = true + mail = UserNotifications.user_posted( + response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + expect(mail.html_part.to_s).to_not include(response.raw) + expect(mail.text_part.to_s).to_not include(response.raw) + end end describe '.user_private_message' do @@ -397,6 +435,21 @@ describe UserNotifications do tu = TopicUser.get(topic.id, response.user) expect(tu.last_emailed_post_number).to eq(response.post_number) end + + it "doesn't include details when private_email is enabled" do + SiteSetting.private_email = true + mail = UserNotifications.user_private_message( + response.user, + post: response, + notification_type: notification.notification_type, + notification_data_hash: notification.data_hash + ) + + expect(mail.html_part.to_s).to_not include(response.raw) + expect(mail.html_part.to_s).to_not include(topic.url) + expect(mail.text_part.to_s).to_not include(response.raw) + expect(mail.text_part.to_s).to_not include(topic.url) + end end @@ -449,6 +502,28 @@ describe UserNotifications do end end + shared_examples "respect for private_email" do + context "private_email" do + it "doesn't support reply by email" do + SiteSetting.private_email = true + mailer = UserNotifications.send( + mail_type, + user, + notification_type: Notification.types[notification.notification_type], + notification_data_hash: notification.data_hash, + post: notification.post + ) + message = mailer.message + + topic = notification.post.topic + expect(message.html_part.body.to_s).not_to include(topic.title) + expect(message.html_part.body.to_s).not_to include(topic.slug) + expect(message.text_part.body.to_s).not_to include(topic.title) + expect(message.text_part.body.to_s).not_to include(topic.slug) + end + end + end + # The parts of emails that are derived from templates are translated shared_examples "sets user locale" do context "set locale for translating templates" do @@ -546,6 +621,7 @@ describe UserNotifications do describe "user mentioned email" do include_examples "notification email building" do let(:notification_type) { :mentioned } + include_examples "respect for private_email" include_examples "supports reply by email" include_examples "sets user locale" end @@ -554,6 +630,7 @@ describe UserNotifications do describe "user replied" do include_examples "notification email building" do let(:notification_type) { :replied } + include_examples "respect for private_email" include_examples "supports reply by email" include_examples "sets user locale" end @@ -562,6 +639,7 @@ describe UserNotifications do describe "user quoted" do include_examples "notification email building" do let(:notification_type) { :quoted } + include_examples "respect for private_email" include_examples "supports reply by email" include_examples "sets user locale" end @@ -570,6 +648,7 @@ describe UserNotifications do describe "user posted" do include_examples "notification email building" do let(:notification_type) { :posted } + include_examples "respect for private_email" include_examples "supports reply by email" include_examples "sets user locale" end @@ -578,6 +657,7 @@ describe UserNotifications do describe "user invited to a private message" do include_examples "notification email building" do let(:notification_type) { :invited_to_private_message } + include_examples "respect for private_email" include_examples "no reply by email" include_examples "sets user locale" end @@ -586,6 +666,7 @@ describe UserNotifications do describe "user invited to a topic" do include_examples "notification email building" do let(:notification_type) { :invited_to_topic } + include_examples "respect for private_email" include_examples "no reply by email" include_examples "sets user locale" end @@ -594,6 +675,7 @@ describe UserNotifications do describe "watching first post" do include_examples "notification email building" do let(:notification_type) { :invited_to_topic } + include_examples "respect for private_email" include_examples "no reply by email" include_examples "sets user locale" end