提交 8e9bc11d 编写于 作者: D Dan Olson

Remove --skip-action-view option from application generator

上级 4e8ea13b
* Remove --skip-action-view option from Rails::Generators::AppBase
Fixes #17023.
*Dan Olson*
* Specify dummy app's db migrate path in plugin's test_helper.rb.
Fixes #16877.
......
......@@ -44,9 +44,6 @@ def self.add_shared_options_for(name)
class_option :skip_gems, type: :array, default: [],
desc: 'Skip the provided gems files'
class_option :skip_action_view, type: :boolean, aliases: '-V', default: false,
desc: 'Skip Action View files'
class_option :skip_sprockets, type: :boolean, aliases: '-S', default: false,
desc: 'Skip Sprockets files'
......@@ -167,7 +164,7 @@ def database_gemfile_entry
end
def include_all_railties?
!options[:skip_active_record] && !options[:skip_action_view] && !options[:skip_test_unit] && !options[:skip_sprockets]
!options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets]
end
def comment_if(value)
......
......@@ -9,7 +9,7 @@
<%= comment_if :skip_active_record %>require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
<%= comment_if :skip_action_view %>require "action_view/railtie"
require "action_view/railtie"
<%= comment_if :skip_sprockets %>require "sprockets/railtie"
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
......
......@@ -7,7 +7,7 @@
<%= comment_if :skip_active_record %>require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
<%= comment_if :skip_action_view %>require "action_view/railtie"
require "action_view/railtie"
<%= comment_if :skip_sprockets %>require "sprockets/railtie"
<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
......
......@@ -268,11 +268,6 @@ def test_generator_if_skip_active_record_is_given
end
end
def test_generator_if_skip_action_view_is_given
run_generator [destination_root, "--skip-action-view"]
assert_file "config/application.rb", /#\s+require\s+["']action_view\/railtie["']/
end
def test_generator_if_skip_sprockets_is_given
run_generator [destination_root, "--skip-sprockets"]
assert_no_file "config/initializers/assets.rb"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册