Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 08:16:03 +01:00
Code Issues Packages Projects Releases Activity

cleanup: rubocop: fix Layout/AlignArguments in test/unit/mailer_test.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18900 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2019-11-05 14:07:52 +00:00
parent 2f1138f9ba
commit dcc9ea1c0a
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/unit/mailer_test.rb
View File

@@ -611,8 +611,8 @@ class MailerTest < ActiveSupport::TestCase
assert Mailer.deliver_wiki_content_added(content) assert Mailer.deliver_wiki_content_added(content)
assert_select_email do assert_select_email do
assert_select 'a[href=?]', assert_select 'a[href=?]',
'http://localhost:3000/projects/ecookbook/wiki/CookBook_documentation', 'http://localhost:3000/projects/ecookbook/wiki/CookBook_documentation',
:text => 'CookBook documentation' :text => 'CookBook documentation'
end end
end end
end end
@@ -622,8 +622,8 @@ class MailerTest < ActiveSupport::TestCase
assert Mailer.deliver_wiki_content_updated(content) assert Mailer.deliver_wiki_content_updated(content)
assert_select_email do assert_select_email do
assert_select 'a[href=?]', assert_select 'a[href=?]',
'http://localhost:3000/projects/ecookbook/wiki/CookBook_documentation', 'http://localhost:3000/projects/ecookbook/wiki/CookBook_documentation',
:text => 'CookBook documentation' :text => 'CookBook documentation'
end end
end end
@@ -816,10 +816,11 @@ class MailerTest < ActiveSupport::TestCase
def test_security_notification_should_include_title def test_security_notification_should_include_title
set_language_if_valid User.find(2).language set_language_if_valid User.find(2).language
with_settings :emails_footer => "footer without link" do with_settings :emails_footer => "footer without link" do
assert Mailer.deliver_security_notification(User.find(2), User.find(2), assert Mailer.deliver_security_notification(
message: :notice_account_password_updated, User.find(2), User.find(2),
title: :label_my_account message: :notice_account_password_updated,
) title: :label_my_account
)
assert_select_email do assert_select_email do
assert_select "a", false assert_select "a", false
assert_select "h1", :text => I18n.t(:label_my_account) assert_select "h1", :text => I18n.t(:label_my_account)
@@ -830,11 +831,12 @@ class MailerTest < ActiveSupport::TestCase
def test_security_notification_should_include_link def test_security_notification_should_include_link
set_language_if_valid User.find(3).language set_language_if_valid User.find(3).language
with_settings :emails_footer => "footer without link" do with_settings :emails_footer => "footer without link" do
assert Mailer.deliver_security_notification(User.find(3), User.find(3), assert Mailer.deliver_security_notification(
message: :notice_account_password_updated, User.find(3), User.find(3),
title: :label_my_account, message: :notice_account_password_updated,
url: {controller: 'my', action: 'account'} title: :label_my_account,
) url: {controller: 'my', action: 'account'}
)
assert_select_email do assert_select_email do
assert_select "h1", false assert_select "h1", false
assert_select 'a[href=?]', 'http://localhost:3000/my/account', :text => I18n.t(:label_my_account) assert_select 'a[href=?]', 'http://localhost:3000/my/account', :text => I18n.t(:label_my_account)
@@ -868,7 +870,7 @@ class MailerTest < ActiveSupport::TestCase
def test_token_for_should_strip_trailing_gt_from_address_with_full_name def test_token_for_should_strip_trailing_gt_from_address_with_full_name
with_settings :mail_from => "Redmine Mailer<no-reply@redmine.org>" do with_settings :mail_from => "Redmine Mailer<no-reply@redmine.org>" do
assert_match /\Aredmine.issue-\d+\.\d+\.3@redmine.org\z/, assert_match /\Aredmine.issue-\d+\.\d+\.3@redmine.org\z/,
Mailer.token_for(Issue.generate!, User.find(3)) Mailer.token_for(Issue.generate!, User.find(3))
end end
end end
@@ -978,26 +980,23 @@ class MailerTest < ActiveSupport::TestCase
def test_email_addresses_should_keep_addresses def test_email_addresses_should_keep_addresses
assert_equal ["foo@example.net"], assert_equal ["foo@example.net"],
Mailer.email_addresses("foo@example.net") Mailer.email_addresses("foo@example.net")
assert_equal ["foo@example.net", "bar@example.net"], assert_equal ["foo@example.net", "bar@example.net"],
Mailer.email_addresses(["foo@example.net", "bar@example.net"]) Mailer.email_addresses(["foo@example.net", "bar@example.net"])
end end
def test_email_addresses_should_replace_users_with_their_email_addresses def test_email_addresses_should_replace_users_with_their_email_addresses
assert_equal ["admin@somenet.foo"], assert_equal ["admin@somenet.foo"],
Mailer.email_addresses(User.find(1)) Mailer.email_addresses(User.find(1))
assert_equal ["admin@somenet.foo", "jsmith@somenet.foo"], assert_equal ["admin@somenet.foo", "jsmith@somenet.foo"],
Mailer.email_addresses(User.where(:id => [1,2])).sort Mailer.email_addresses(User.where(:id => [1,2])).sort
end end
def test_email_addresses_should_include_notified_emails_addresses_only def test_email_addresses_should_include_notified_emails_addresses_only
EmailAddress.create!(:user_id => 2, :address => "another@somenet.foo", :notify => false) EmailAddress.create!(:user_id => 2, :address => "another@somenet.foo", :notify => false)
EmailAddress.create!(:user_id => 2, :address => "another2@somenet.foo") EmailAddress.create!(:user_id => 2, :address => "another2@somenet.foo")
assert_equal ["another2@somenet.foo", "jsmith@somenet.foo"], assert_equal ["another2@somenet.foo", "jsmith@somenet.foo"],
Mailer.email_addresses(User.find(2)).sort Mailer.email_addresses(User.find(2)).sort
end end
private private