From: Tom Hughes Date: Sun, 5 Jan 2020 19:44:30 +0000 (+0000) Subject: Make sure custom settings are picked up by tests X-Git-Tag: live~2923 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f5b00499c04cc13ce483ed9118a83bfa9ee4d246?ds=sidebyside;hp=--cc Make sure custom settings are picked up by tests Version 2.1.0 of the config removes settings.local.yml from the files read in the test environment. --- f5b00499c04cc13ce483ed9118a83bfa9ee4d246 diff --git a/.travis.yml b/.travis.yml index b950b1e18..31f4aec53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,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