Merge branch 'master' into HEAD

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

diff --git a/config/settings/test.yml b/config/settings/test.yml
index 77afe95ee3a94b2c7c0bf326c5d51b6af1cee8f7..5c5673f7dfd3a364fa1edda5ec12c1dfa128fb23 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -1,6 +1,3 @@
-# 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
@@ -21,3 +18,6 @@ wikipedia_auth_secret: "dummy"
 server_url: "test.host"
 # Storage services for testing
 avatar_storage: "test"
+trace_file_storage: "test"
+trace_image_storage: "test"
+trace_icon_storage: "test"