gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Misc spec coverage improvements (#2821)

Browse source 
* Dont use raise_error by itself (avoids warning)

* Add coverage for AccountFilter

* Improve coverage and refactor for Subscription#lease_seconds

* Improve coverage and refactor for NotificationMailer

* Simplify assignment of min/max threshold on subscription
This commit is contained in:
Matt Jankowski 2017-05-05 14:56:00 -04:00 • committed by GitHub
parent d08f1112d5
commit 484c9709b6
7 changed files with 128 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/mailers/notification_mailer.rb
View file

@ -7,7 +7,7 @@ class NotificationMailer < ApplicationMailer
@me = recipient
@status = notification.target_status
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email, subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct)
end
end
@ -16,7 +16,7 @@ class NotificationMailer < ApplicationMailer
@me = recipient
@account = notification.from_account
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email, subject: I18n.t('notification_mailer.follow.subject', name: @account.acct)
end
end
@ -26,7 +26,7 @@ class NotificationMailer < ApplicationMailer
@account = notification.from_account
@status = notification.target_status
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email, subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct)
end
end
@ -36,7 +36,7 @@ class NotificationMailer < ApplicationMailer
@account = notification.from_account
@status = notification.target_status
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email, subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct)
end
end
@ -45,7 +45,7 @@ class NotificationMailer < ApplicationMailer
@me = recipient
@account = notification.from_account
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email, subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
end
end
@ -58,7 +58,7 @@ class NotificationMailer < ApplicationMailer
return if @notifications.empty?
I18n.with_locale(@me.user.locale || I18n.default_locale) do
locale_for_account(@me) do
mail to: @me.user.email,
subject: I18n.t(
:subject,
@ -67,4 +67,12 @@ class NotificationMailer < ApplicationMailer
)
end
end
private
def locale_for_account(account)
I18n.with_locale(account.user.locale || I18n.default_locale) do
yield
end
end
end