aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-02-01 20:14:26 +0900
committerAkira Matsuda <ronnie@dio.jp>2013-02-01 22:10:45 +0900
commit517cfbe11094582299ed4e185d6c3a4b7a3282ea (patch)
tree66745df1d5e01018a76f189cc73ab5987b17c206 /railties
parentb40bd16b7b0810b9d5621339f243c4a9569ceb96 (diff)
downloadrails-517cfbe11094582299ed4e185d6c3a4b7a3282ea.tar.gz
rails-517cfbe11094582299ed4e185d6c3a4b7a3282ea.tar.bz2
rails-517cfbe11094582299ed4e185d6c3a4b7a3282ea.zip
--no-rc in the railties tests
so that the tester's local .railsrc file does not affect the test results
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/app_generator_test.rb2
-rw-r--r--railties/test/isolation/abstract_unit.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index b2deeb011d..83f43d1025 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -70,7 +70,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
def test_application_new_exits_with_non_zero_code_on_invalid_application_name
- quietly { system 'rails new test' }
+ quietly { system 'rails new test --no-rc' }
assert_equal false, $?.success?
end
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 7ae1b5ccfd..68d96bae94 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -279,7 +279,7 @@ Module.new do
environment = File.expand_path('../../../../load_paths', __FILE__)
require_environment = "-r #{environment}"
- `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path} --skip-gemfile`
+ `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path} --skip-gemfile --no-rc`
File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
f.puts "require '#{environment}'"
f.puts "require 'rails/all'"