diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-09 13:11:51 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-09 13:11:51 -0200 |
| commit | 6f9eab9ebe03cdb3bd0aa9a6e2b3ece0ed354311 (patch) | |
| tree | e3d349ad02377a12412272cfbabbcb1feec30748 /railties/test/generators | |
| parent | 924ef1c79a62ab97fe0c747395aad07d886a96e2 (diff) | |
| parent | 6870d48d193e9ef759ad870a705707003f26129a (diff) | |
| download | rails-6f9eab9ebe03cdb3bd0aa9a6e2b3ece0ed354311.tar.gz rails-6f9eab9ebe03cdb3bd0aa9a6e2b3ece0ed354311.tar.bz2 rails-6f9eab9ebe03cdb3bd0aa9a6e2b3ece0ed354311.zip | |
Merge pull request #18416 from caike/master
Add _mailer suffix to i18n path
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 6 | ||||
| -rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 8d2d97f64f..febd2fd12e 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -26,8 +26,8 @@ class MailerGeneratorTest < Rails::Generators::TestCase def test_mailer_with_i18n_helper run_generator assert_file "app/mailers/notifier_mailer.rb" do |mailer| - assert_match(/en\.notifier\.foo\.subject/, mailer) - assert_match(/en\.notifier\.bar\.subject/, mailer) + assert_match(/en\.notifier_mailer\.foo\.subject/, mailer) + assert_match(/en\.notifier_mailer\.bar\.subject/, mailer) end end @@ -126,7 +126,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase run_generator ["Farm::Animal", "moos"] assert_file "app/mailers/farm/animal_mailer.rb" do |mailer| assert_match(/class Farm::AnimalMailer < ApplicationMailer/, mailer) - assert_match(/en\.farm\.animal\.moos\.subject/, mailer) + assert_match(/en\.farm\.animal_mailer\.moos\.subject/, mailer) end assert_file "test/mailers/previews/farm/animal_mailer_preview.rb" do |preview| assert_match(/\# Preview all emails at http:\/\/localhost\:3000\/rails\/mailers\/farm\/animal/, preview) diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index a4dad1f2b4..d0ea01dfb0 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -156,8 +156,8 @@ class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase def test_mailer_with_i18n_helper run_generator assert_file "app/mailers/test_app/notifier_mailer.rb" do |mailer| - assert_match(/en\.notifier\.foo\.subject/, mailer) - assert_match(/en\.notifier\.bar\.subject/, mailer) + assert_match(/en\.notifier_mailer\.foo\.subject/, mailer) + assert_match(/en\.notifier_mailer\.bar\.subject/, mailer) end end |