Always run tests using example.application.yml

This fixes an Oauth integration test failure when a
custom application.yml is present.

diff --git a/config/preinitializer.rb b/config/preinitializer.rb
index 1cc3f62c780a37bf64e6920bf1ed1bbf144ee9ca..377e6bad4a6a13ac33095926085eccefccc925fb 100644 (file)
--- 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_(.*)$/)