summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-02 11:38:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-01-02 11:38:29 +0000
commit313bfa54087e6c9c8b8564e06620a76184f408a9 (patch)
treecf72831e2338af0b121905a989e90a1e136aaf59
parent2ab7dba9641cb5e355314f3707f0e7f3ee8a84e5 (diff)
downloadredmine-313bfa54087e6c9c8b8564e06620a76184f408a9.tar.gz
redmine-313bfa54087e6c9c8b8564e06620a76184f408a9.zip
test: replace should "include the emails_header" at unit mailer test to Rails standard test suite
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8469 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/unit/mailer_test.rb15
1 files changed, 6 insertions, 9 deletions
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 3044ae063..20efd057b 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -486,15 +486,12 @@ class MailerTest < ActiveSupport::TestCase
assert !mail.encoded.strip.split("\r\n").detect(&:blank?), "#{mail.encoded} malformed"
end
- context "layout" do
- should "include the emails_header" do
- with_settings(:emails_header => "*Header content*") do
- assert Mailer.deliver_test(User.find(1))
-
- assert_select_email do
- assert_select ".header" do
- assert_select "strong", :text => "Header content"
- end
+ def test_layout_should_include_the_emails_header
+ with_settings :emails_header => "*Header content*" do
+ assert Mailer.deliver_test(User.find(1))
+ assert_select_email do
+ assert_select ".header" do
+ assert_select "strong", :text => "Header content"
end
end
end