Merge branch 'master' of github.com:tibastral/presentations

tibastral · Oct 30, 2013 · d000f44 · d000f44
2 parents 85ef6e1 + f14e7ba
commit d000f44
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,7 @@
 language: ruby
 rvm:
   1.9.3
-before_script: RAILS_ENV=test rake db:migrate --trace
+before_script:
+  - cp config/travis.database.yml config/database.yml
+  - psql -c 'create database presentations_test;' -U postgres
+  - RAILS_ENV=test rake db:migrate --trace
diff --git a/config/travis.database.yml b/config/travis.database.yml
@@ -0,0 +1,13 @@
+# Travis CI requires the username `postgres` when using postgresql as
+# the database service. This however clashes with the common postgresql
+# installation on Macs (i.e. the postgres username is the system username).
+test: &test
+  adapter: postgresql
+  username: postgres
+  encoding: unicode
+  database: presentations_test
+  pool: 5
+  min_messages: WARNING
+
+cucumber:
+  <<: *test