aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/isolation
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-10-15 14:50:02 -0700
committerCarl Lerche <carllerche@mac.com>2009-10-15 14:54:12 -0700
commit97296b11e2c4011ea5522c4de0153f7ffa6a47ae (patch)
treec21e07dede9bb91108839ccafbbfa29f2e4838d7 /railties/test/isolation
parente1490d4e4c60211173d51e7b21c16dbe4c2d942a (diff)
downloadrails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.tar.gz
rails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.tar.bz2
rails-97296b11e2c4011ea5522c4de0153f7ffa6a47ae.zip
Have config/application.rb contain the application definition and require that file instead of config/boot.rb or config/environment.rb in script/*.
Diffstat (limited to 'railties/test/isolation')
-rw-r--r--railties/test/isolation/abstract_unit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 245577e8c0..5bc878b3be 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -94,9 +94,9 @@ module TestHelpers
end
def add_to_config(str)
- environment = File.read("#{app_path}/config/environment.rb")
+ environment = File.read("#{app_path}/config/application.rb")
if environment =~ /(\n\s*end\s*)\Z/
- File.open("#{app_path}/config/environment.rb", 'w') do |f|
+ File.open("#{app_path}/config/application.rb", 'w') do |f|
f.puts $` + "\n#{str}\n" + $1
end
end