Commit 9ad4c06e277c5e355f1623327af9780f4bd734a2
1 parent
301420b8
Exists in
master
and in
1 other branch
We need to make sure that we are running our tests with the default Errbit config.
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
config/initializers/_load_config.rb
... | ... | @@ -14,7 +14,8 @@ if ENV['HEROKU'] |
14 | 14 | :domain => ENV['SENDGRID_DOMAIN'] |
15 | 15 | } |
16 | 16 | else |
17 | - yaml = File.read(Rails.root.join('config','config.yml')) | |
17 | + config_file = Rails.env == "test" ? "config.example.yml" : "config.yml" | |
18 | + yaml = File.read(Rails.root.join('config', config_file)) | |
18 | 19 | config = YAML.load(yaml) |
19 | 20 | |
20 | 21 | config.merge!(config.delete(Rails.env)) if config.has_key?(Rails.env) | ... | ... |