aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/fixtures
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-05 21:56:18 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-05 21:56:18 +0000
commitba553f94248340b54b32cee1fcbd41295713d180 (patch)
tree232174d19991632ef0583cb685d5f3c520a510cd /actionmailer/test/fixtures
parent2fbe0ae7a2d945dbd9d0e0abad23afde75db67fb (diff)
downloadrails-ba553f94248340b54b32cee1fcbd41295713d180.tar.gz
rails-ba553f94248340b54b32cee1fcbd41295713d180.tar.bz2
rails-ba553f94248340b54b32cee1fcbd41295713d180.zip
Add assert_emails and assert_no_emails to test the number of emails delivered. Closes #6479.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5436 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test/fixtures')
-rw-r--r--actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml1
-rw-r--r--actionmailer/test/fixtures/helper_mailer/use_test_helper.rhtml1
-rw-r--r--actionmailer/test/fixtures/helpers/example_helper.rb (renamed from actionmailer/test/fixtures/helpers/test_helper.rb)4
3 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml
new file mode 100644
index 0000000000..fcff3bb1b4
--- /dev/null
+++ b/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml
@@ -0,0 +1 @@
+So, <%= example_format(@text) %>
diff --git a/actionmailer/test/fixtures/helper_mailer/use_test_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_test_helper.rhtml
deleted file mode 100644
index 52ea9aa413..0000000000
--- a/actionmailer/test/fixtures/helper_mailer/use_test_helper.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-So, <%= test_format(@text) %>
diff --git a/actionmailer/test/fixtures/helpers/test_helper.rb b/actionmailer/test/fixtures/helpers/example_helper.rb
index f479820c96..d66927aa60 100644
--- a/actionmailer/test/fixtures/helpers/test_helper.rb
+++ b/actionmailer/test/fixtures/helpers/example_helper.rb
@@ -1,5 +1,5 @@
-module TestHelper
- def test_format(text)
+module ExampleHelper
+ def example_format(text)
"<em><strong><small>#{text}</small></strong></em>"
end
end