summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-15 05:07:06 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-15 05:07:06 +0000
commit6a3d42dd691d8161904c38a1c350249cbd05daae (patch)
treea36c2f2d5e1911ade182abfc4aa5fac7b037a093
parent36e0d3273d86570b291283e7a277524ab3a37db5 (diff)
downloadredmine-6a3d42dd691d8161904c38a1c350249cbd05daae.tar.gz
redmine-6a3d42dd691d8161904c38a1c350249cbd05daae.zip
code cleanup: rubocop: fix Layout/EmptyLineBetweenDefs in test/unit/mailer_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18673 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--test/unit/mailer_test.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index da2fda522..d350ece64 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -128,7 +128,6 @@ Layout/EmptyLineAfterGuardClause:
Layout/EmptyLineBetweenDefs:
Exclude:
- 'app/models/version.rb'
- - 'test/unit/mailer_test.rb'
- 'test/unit/project_test.rb'
# Cop supports --auto-correct.
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 7e129a4f5..486131a8f 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -266,6 +266,7 @@ class MailerTest < ActiveSupport::TestCase
assert_match /<redmine@example\.net>/, mail.from_addrs.first
assert_equal '[Redmine app] <redmine@example.net>', mail.header['From'].to_s
end
+
def test_from_header_with_author_name
# Use the author's name or Setting.app_title as a display name
# when Setting.mail_from does not include a display name