aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-07 07:04:43 -0700
committerPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-07 07:04:43 -0700
commit73461362a023024ced32e1b2c462230116125eb5 (patch)
tree71fcbc28c61de8a3a3ca91ad83b397654790f5db /railties/test
parentbb19fb373696f80bb627c438848ed0b673a76d57 (diff)
downloadrails-73461362a023024ced32e1b2c462230116125eb5.tar.gz
rails-73461362a023024ced32e1b2c462230116125eb5.tar.bz2
rails-73461362a023024ced32e1b2c462230116125eb5.zip
Remove FORCE option as it was only needed for tests
- Adjusted tests instead.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index d9d4b78a45..058308aa13 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -208,7 +208,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
FileUtils.rm("#{app_root}/config/initializers/new_framework_defaults.rb")
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_match(/ActiveSupport\.halt_callback_chains_on_return_false = true/, content)