From 57c4438b7559def36e74725346210fd7278b3a48 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 6 Aug 2013 18:50:00 +0100 Subject: [PATCH] Detect test environment correctly --- config/preinitializer.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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| -- 2.43.2