aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-27 19:33:26 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-27 19:33:26 -0800
commit079714277df4641a24513b2595c0237293f48512 (patch)
tree1b7685a6dd861bb5d663b0601ac77c2b407c7f50 /railties
parentfd0eb3d904235e8ebf21d6e79d45096d4c9c71bf (diff)
downloadrails-079714277df4641a24513b2595c0237293f48512.tar.gz
rails-079714277df4641a24513b2595c0237293f48512.tar.bz2
rails-079714277df4641a24513b2595c0237293f48512.zip
Attend to brittle mailer generator tests
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/mailer_generator_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 0b7f5c6817..e76ac5fb7d 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -9,7 +9,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
run_generator
assert_file "app/mailers/notifier.rb" do |mailer|
assert_match /class Notifier < ActionMailer::Base/, mailer
- assert_match /self\.defaults :from => "from@example.com"/, mailer
+ assert_match /defaults :from => "from@example.com"/, mailer
end
end
@@ -61,12 +61,12 @@ class MailerGeneratorTest < Rails::Generators::TestCase
assert_file "app/mailers/notifier.rb" do |mailer|
assert_instance_method :foo, mailer do |foo|
- assert_match /mail\(:to => "to@example.org"\)/, foo
+ assert_match /mail :to => "to@example.org"/, foo
assert_match /@greeting = "Hi"/, foo
end
assert_instance_method :bar, mailer do |bar|
- assert_match /mail\(:to => "to@example.org"\)/, bar
+ assert_match /mail :to => "to@example.org"/, bar
assert_match /@greeting = "Hi"/, bar
end
end