From 9ad4c06e277c5e355f1623327af9780f4bd734a2 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Thu, 11 Aug 2011 17:54:42 +0800 Subject: [PATCH] We need to make sure that we are running our tests with the default Errbit config. --- config/initializers/_load_config.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb index d406ff0..2439502 100644 --- a/config/initializers/_load_config.rb +++ b/config/initializers/_load_config.rb @@ -14,7 +14,8 @@ if ENV['HEROKU'] :domain => ENV['SENDGRID_DOMAIN'] } else - yaml = File.read(Rails.root.join('config','config.yml')) + config_file = Rails.env == "test" ? "config.example.yml" : "config.yml" + yaml = File.read(Rails.root.join('config', config_file)) config = YAML.load(yaml) config.merge!(config.delete(Rails.env)) if config.has_key?(Rails.env) -- libgit2 0.21.2