mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #39851 from piecehealth/engine_skip_mailers 

--skip-action-mailer option doesn't work for "rails plugin new"
This commit is contained in:
Eugene Kenny 2020-08-04 20:13:19 +01:00 committed by GitHub
parent 8de10f9bb6 1f2d0120c0
commit e53f5ff730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
railties/lib/rails/generators/rails/plugin/plugin_generator.rb
View File

@ -25,10 +25,14 @@ module Rails
directory "app"
empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"
end
remove_dir "app/mailers" if options[:skip_action_mailer]
remove_dir "app/jobs" if options[:skip_active_job]
elsif full?
empty_directory_with_keep_file "app/models"
empty_directory_with_keep_file "app/controllers"
empty_directory_with_keep_file "app/mailers"
empty_directory_with_keep_file "app/mailers" unless options[:skip_action_mailer]
empty_directory_with_keep_file "app/jobs" unless options[:skip_active_job]
unless api?
empty_directory_with_keep_file "app/assets/images/#{namespaced_name}"

21
railties/test/generators/plugin_generator_test.rb
View File

@ -232,6 +232,24 @@ class PluginGeneratorTest < Rails::Generators::TestCase
end
end
def test_skip_action_mailer_and_skip_active_job_with_mountable
run_generator [destination_root, "--mountable", "--skip-action-mailer", "--skip-active-job"]
assert_no_directory "app/mailers"
assert_no_directory "app/jobs"
end
def test_skip_action_mailer_and_skip_active_job_with_api_and_mountable
run_generator [destination_root, "--api", "--mountable", "--skip-action-mailer", "--skip-active-job"]
assert_no_directory "app/mailers"
assert_no_directory "app/jobs"
end
def test_skip_action_mailer_and_skip_active_job_with_full
run_generator [destination_root, "--full", "--skip-action-mailer", "--skip-active-job"]
assert_no_directory "app/mailers"
assert_no_directory "app/jobs"
end
def test_template_from_dir_pwd
FileUtils.cd(Rails.root)
assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))
@ -268,6 +286,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
assert_file "app/views"
assert_file "app/helpers"
assert_file "app/mailers"
assert_file "app/jobs"
assert_file "bin/rails", /\s+require\s+["']rails\/all["']/
assert_file "config/routes.rb", /Rails.application.routes.draw do/
assert_file "lib/bukkits/engine.rb", /module Bukkits\n class Engine < ::Rails::Engine\n end\nend/
@ -284,6 +303,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
assert_file "hyphenated-name/app/views"
assert_file "hyphenated-name/app/helpers"
assert_file "hyphenated-name/app/mailers"
assert_file "hyphenated-name/app/jobs"
assert_file "hyphenated-name/bin/rails"
assert_file "hyphenated-name/config/routes.rb", /Rails.application.routes.draw do/
assert_file "hyphenated-name/lib/hyphenated/name/engine.rb", /module Hyphenated\n module Name\n class Engine < ::Rails::Engine\n end\n end\nend/
@ -301,6 +321,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
assert_file "my_hyphenated-name/app/views"
assert_file "my_hyphenated-name/app/helpers"
assert_file "my_hyphenated-name/app/mailers"
assert_file "my_hyphenated-name/app/jobs"
assert_file "my_hyphenated-name/bin/rails"
assert_file "my_hyphenated-name/config/routes.rb", /Rails\.application\.routes\.draw do/
assert_file "my_hyphenated-name/lib/my_hyphenated/name/engine.rb", /module MyHyphenated\n module Name\n class Engine < ::Rails::Engine\n end\n end\nend/