Merge branch 'master' into tag-colour-preview-rebase

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

diff --git a/config/settings/test.yml b/config/settings/test.yml
index 307eb7f65a94e5c450880542965895c5b95d2b2b..d3952e27bba028b91657916af8b10073103fc0be 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -1,5 +1,8 @@
+# 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
@@ -14,3 +17,5 @@ github_auth_id: "dummy"
 github_auth_secret: "dummy"
 wikipedia_auth_id: "dummy"
 wikipedia_auth_secret: "dummy"
+# Server URL for testing
+server_url: "test.host"