Merge remote-tracking branch 'upstream/pull/4190'

[rails.git] / config / settings / test.yml

diff --git a/config/settings/test.yml b/config/settings/test.yml
index 3d940aec9a4e1886150c5a85e69b34c655f4fe5e..64039e362c4f8c879c0f419e3ddd4bd04a64717b 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -1,18 +1,13 @@
-# Trace directories for testing
-gpx_trace_dir: <%= Rails.root.join("test", "gpx", "traces") %>
-gpx_image_dir: <%= Rails.root.join("test", "gpx", "images") %>
 # Ignore the diary feed delay unless we're specifically testing it
 diary_feed_delay: 0
-# Geonames credentials for testing
-geonames_username: "dummy"
 # External authentication credentials for testing
 google_auth_id: "dummy"
 google_auth_secret: "dummy"
 google_openid_realm: "https://www.openstreetmap.org"
 facebook_auth_id: "dummy"
 facebook_auth_secret: "dummy"
-windowslive_auth_id: "dummy"
-windowslive_auth_secret: "dummy"
+microsoft_auth_id: "dummy"
+microsoft_auth_secret: "dummy"
 github_auth_id: "dummy"
 github_auth_secret: "dummy"
 wikipedia_auth_id: "dummy"