Merge branch 'master' into redesign

[rails.git] / config / preinitializer.rb

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 357e30218fef8d9bb2c08423378e85986b21ba11..ec05a6070b9929c8004d83993a293aa250c5ccdc 100644 (file)
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1,7 +1,12 @@
 require 'yaml'
 
-config = YAML.load_file("#{RAILS_ROOT}/config/application.yml")
-env = ENV['RAILS_ENV'] || 'development'
+if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+  env = "test"
+else
+  env = ENV['RAILS_ENV'] || 'development'
+end
+
+config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__))
 
 ENV.each do |key,value|
   if key.match(/^OSM_(.*)$/)