From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 Aug 2013 17:50:00 +0000 (+0100)
Subject: Detect test environment correctly
X-Git-Tag: live~5333
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/57c4438b7559def36e74725346210fd7278b3a48

Detect test environment correctly
---

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 377e6bad4..ec05a6070 100644
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -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|