diff options
| author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-06-12 09:18:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 09:18:46 -0400 |
| commit | 39fa2c53299e0edf81b361fb784ce783081085ed (patch) | |
| tree | b94065c7f44cab66d8fd2c991b1b991900f87348 /railties/test | |
| parent | 8f8a07d7eb01adeb399874d3046ee9b4664075e1 (diff) | |
| parent | f0f4cb2f64566020b6edd48e0a81fd744ffc2e4c (diff) | |
| download | rails-39fa2c53299e0edf81b361fb784ce783081085ed.tar.gz rails-39fa2c53299e0edf81b361fb784ce783081085ed.tar.bz2 rails-39fa2c53299e0edf81b361fb784ce783081085ed.zip | |
Merge pull request #25004 from y-yagi/generate_mailer_layout_files_if_it_does_not_already_exist
generate mailer layout files if it does not already exist
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 8 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 8728b39dae..6a4951840d 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -84,6 +84,10 @@ class MailerGeneratorTest < Rails::Generators::TestCase assert_match(%r(\sapp/views/notifier_mailer/bar\.text\.erb), view) assert_match(/<%= @greeting %>/, view) end + + assert_file "app/views/layouts/mailer.text.erb" do |view| + assert_match(/<%= yield %>/, view) + end end def test_invokes_default_html_template_engine @@ -97,6 +101,10 @@ class MailerGeneratorTest < Rails::Generators::TestCase assert_match(%r(\sapp/views/notifier_mailer/bar\.html\.erb), view) assert_match(/<%= @greeting %>/, view) end + + assert_file "app/views/layouts/mailer.html.erb" do |view| + assert_match(%r{<body>\n <%= yield %>\n </body>}, view) + end end def test_invokes_default_template_engine_even_with_no_action diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 3cc8e1de55..5dd4cce28a 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -669,6 +669,21 @@ class PluginGeneratorTest < Rails::Generators::TestCase end end + def test_generate_mailer_layouts_when_does_not_exist_in_mountable_engine + run_generator [destination_root, '--mountable'] + capture(:stdout) do + `#{destination_root}/bin/rails g mailer User` + end + + assert_file "#{destination_root}/app/views/layouts/bukkits/mailer.text.erb" do |view| + assert_match(/<%= yield %>/, view) + end + + assert_file "#{destination_root}/app/views/layouts/bukkits/mailer.html.erb" do |view| + assert_match(%r{<body>\n <%= yield %>\n </body>}, view) + end + end + def test_generate_application_job_when_does_not_exist_in_mountable_engine run_generator [destination_root, '--mountable'] FileUtils.rm "#{destination_root}/app/jobs/bukkits/application_job.rb" |