Skip to content
Browse files

Change name of db config file to specify that this is for travis.

  • Loading branch information...
1 parent de7f2e9 commit 53c7ce516db35bb6b6feee2221275d53b530fc6b @scotdalton scotdalton committed Oct 11, 2012
Showing with 2 additions and 4 deletions.
  1. +1 −4 .gitignore
  2. +1 −0 .travis.yml
  3. 0 test/dummy/config/{database.yml → travis_database.yml}
View
5 .gitignore
@@ -7,9 +7,6 @@ test/dummy/tmp/
# as we need a mysql db, we can't distro a database.yml
# for test dummy app that works out of box, so leave it
# out of git so developers can use their own without trouble.
-# UPDATE: in order to test on travis-ci.org we now include the
-# database.yml and therefore comment out this .gitignore item.
-# Travis allows us to test with MySQL.
-# test/dummy/config/database.yml
+test/dummy/config/database.yml
Gemfile.lock
tmp/
View
1 .travis.yml
@@ -10,6 +10,7 @@ before_script:
- mysql -e 'create database umlaut3_test;'
- mysql -e 'create database sfxlcl41_test;'
- mysql -e 'create database sfxglb41_test;'
+ - mv test/dummy/config/travis_database.yml test/dummy/config/database.yml
- cd test/dummy && RAILS_ENV=test bundle exec rake --trace db:schema:load db:migrate
script:
- RAILS_ENV=test bundle exec rake --trace test
View
0 test/dummy/config/database.yml → test/dummy/config/travis_database.yml
File renamed without changes.

0 comments on commit 53c7ce5

Please sign in to comment.
Something went wrong with that request. Please try again.