From c4edac9fd8ca44c3a0c8a9dbee611f872fffe14b Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 31 Jul 2013 16:19:01 -0700 Subject: [PATCH] Always run tests using example.application.yml This fixes an Oauth integration test failure when a custom application.yml is present. --- config/preinitializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/preinitializer.rb b/config/preinitializer.rb index 1cc3f62c7..377e6bad4 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -1,7 +1,7 @@ require 'yaml' -config = YAML.load_file(File.expand_path("../application.yml", __FILE__)) 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_(.*)$/) -- 2.43.2