aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/isolation
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-02-17 00:58:43 +0100
committerXavier Noria <fxn@hashref.com>2016-02-17 00:59:42 +0100
commit94dbc48887bf39c241ee2ce1741ee680d773f202 (patch)
treec066eb7703e4eb3c14ea737f968e9552c75be329 /railties/test/isolation
parent5971fddb7997231f3431c26ba17471ba52704852 (diff)
downloadrails-94dbc48887bf39c241ee2ce1741ee680d773f202.tar.gz
rails-94dbc48887bf39c241ee2ce1741ee680d773f202.tar.bz2
rails-94dbc48887bf39c241ee2ce1741ee680d773f202.zip
adds --skip-listen to the application generator [closes #23590]
Diffstat (limited to 'railties/test/isolation')
-rw-r--r--railties/test/isolation/abstract_unit.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index e7a261fa1f..66a8cf54af 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -154,8 +154,6 @@ module TestHelpers
config.action_controller.allow_forgery_protection = false
config.log_level = :info
RUBY
-
- remove_from_env_config('development', 'config.file_watcher.*')
end
def teardown_app
@@ -328,7 +326,6 @@ class ActiveSupport::TestCase
include ActiveSupport::Testing::Stream
self.test_order = :sorted
-
end
# Create a scope and build a fixture rails app
@@ -342,7 +339,7 @@ Module.new do
environment = File.expand_path('../../../../load_paths', __FILE__)
require_environment = "-r #{environment}"
- `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-gemfile --no-rc`
+ `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-gemfile --skip-listen --no-rc`
File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
f.puts "require '#{environment}'"
f.puts "require 'rails/all'"