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

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

diff --git a/config/settings/test.yml b/config/settings/test.yml
index 022c9324633250247b2088d66b1d7853c973998f..5c5673f7dfd3a364fa1edda5ec12c1dfa128fb23 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -1,6 +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

 # Geonames credentials for testing
 geonames_username: "dummy"
 # External authentication credentials for testing
 # Geonames credentials for testing
 geonames_username: "dummy"
 # External authentication credentials for testing


@@ -15,3 +14,10 @@ github_auth_id: "dummy"
 github_auth_secret: "dummy"
 wikipedia_auth_id: "dummy"
 wikipedia_auth_secret: "dummy"
 github_auth_secret: "dummy"
 wikipedia_auth_id: "dummy"
 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"