diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-27 00:21:22 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-27 00:21:22 +1100 |
| commit | 1133757a95f5cee0044cca6f360f5d63df3bb583 (patch) | |
| tree | 814e4cc19c9b5625f1cc2c19d1fd615453e8b87c /railties/test/generators | |
| parent | 21dcc20ed29053c8ffd4d3a5a68a40f6e225512b (diff) | |
| parent | 8fabcb2eca03150b1c0c3dbc88dd13123f76894f (diff) | |
| download | rails-1133757a95f5cee0044cca6f360f5d63df3bb583.tar.gz rails-1133757a95f5cee0044cca6f360f5d63df3bb583.tar.bz2 rails-1133757a95f5cee0044cca6f360f5d63df3bb583.zip | |
Merge branch 'master' of github.com:mikel/rails
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index e585298a93..0b7f5c6817 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 /self\.defaults :from => "from@example.com"/, mailer end end |