X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f9d714dfd36fa56ced4c0a99a6e59c945ff89cca..252b9ef08a0b0b7d34eea83149cb1a8ad7af9e34:/config/preinitializer.rb

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 377e6bad4..07f105722 100644
--- a/config/preinitializer.rb
+++ b/config/preinitializer.rb
@@ -1,16 +1,17 @@
-require 'yaml'
+require "yaml"
+
+env = if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
+        "test"
+      else
+        ENV["RAILS_ENV"] || "development"
+      end
 
-env = ENV['RAILS_ENV'] || 'development'
 config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__))
 
-ENV.each do |key,value|
-  if key.match(/^OSM_(.*)$/)
-    Object.const_set(Regexp.last_match(1).upcase, value)
-  end
+ENV.each do |key, value|
+  Object.const_set(Regexp.last_match(1).upcase, value) if key =~ /^OSM_(.*)$/
 end
 
-config[env].each do |key,value|
-  unless Object.const_defined?(key.upcase)
-    Object.const_set(key.upcase, value)
-  end
+config[env].each do |key, value|
+  Object.const_set(key.upcase, value) unless Object.const_defined?(key.upcase)
 end