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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b950b1e18e2cbf8083078758a08702d7493c267a..ce0a625ec42b50adc741fb96d1952b37845a79c0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ addons:
   postgresql: 9.5
   apt:
     packages:
+      - firefox-geckodriver
       - libarchive-dev
       - libgd-dev
       - libffi-dev
@@ -21,7 +22,8 @@ before_script:
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
-  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings.local.yml
+  - touch config/settings.local.yml
+  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings/test.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install