Merge branch 'master' into redesign
[rails.git] / config / preinitializer.rb
index 377e6bad4a6a13ac33095926085eccefccc925fb..ec05a6070b9929c8004d83993a293aa250c5ccdc 100644 (file)
@@ -1,6 +1,11 @@
 require 'yaml'
 
-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|