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

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

diff --git a/config/settings/test.yml b/config/settings/test.yml
index d3952e27bba028b91657916af8b10073103fc0be..1f951e8723fb9aa2d6d2c2cdcfce5d5eda58138c 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -1,10 +1,5 @@
-# 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
 # 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"
 # External authentication credentials for testing
 google_auth_id: "dummy"
 google_auth_secret: "dummy"


@@ -19,3 +14,8 @@ wikipedia_auth_id: "dummy"
 wikipedia_auth_secret: "dummy"
 # Server URL for testing
 server_url: "test.host"
 wikipedia_auth_secret: "dummy"
 # Server URL for testing
 server_url: "test.host"

+# Storage services for testing
+avatar_storage: "test"
+trace_file_storage: "test"
+trace_image_storage: "test"
+trace_icon_storage: "test"