Remove FORCE option as it was only needed for tests

- Adjusted tests instead.
上级 bb19fb37
...@@ -48,7 +48,7 @@ namespace :app do ...@@ -48,7 +48,7 @@ namespace :app do
require 'rails/generators' require 'rails/generators'
require 'rails/generators/rails/app/app_generator' require 'rails/generators/rails/app/app_generator'
gen = Rails::Generators::AppGenerator.new ["rails"], gen = Rails::Generators::AppGenerator.new ["rails"],
{ api: !!Rails.application.config.api_only, update: true, force: ENV['FORCE'] }, { api: !!Rails.application.config.api_only, update: true },
destination_root: Rails.root destination_root: Rails.root
File.exist?(Rails.root.join("config", "application.rb")) ? File.exist?(Rails.root.join("config", "application.rb")) ?
gen.send(:app_const) : gen.send(:valid_const?) gen.send(:app_const) : gen.send(:valid_const?)
......
...@@ -208,7 +208,9 @@ def test_rails_update_does_not_create_new_framework_defaults_by_default ...@@ -208,7 +208,9 @@ def test_rails_update_does_not_create_new_framework_defaults_by_default
FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults.rb") FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults.rb")
stub_rails_application(app_root) do stub_rails_application(app_root) do
quietly { `FORCE=true bin/rails app:update` } generator = Rails::Generators::AppGenerator.new ["rails"], { update: true }, destination_root: app_root, shell: @shell
generator.send(:app_const)
quietly { generator.send(:update_config_files) }
assert_file "#{app_root}/config/initializers/new_framework_defaults.rb" do |content| assert_file "#{app_root}/config/initializers/new_framework_defaults.rb" do |content|
assert_match(/ActiveSupport\.halt_callback_chains_on_return_false = true/, content) assert_match(/ActiveSupport\.halt_callback_chains_on_return_false = true/, content)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册