diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | README.textile | 3 | ||||
| -rw-r--r-- | config/database.yml.travis | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3ec535d43..ea412217a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: before_script: - "sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev" - "rake ci:travis" + - "psql -c 'create database chouette_test;' -U postgres" script: "rake spec" notifications: recipients: diff --git a/README.textile b/README.textile index 874fb4908..8ad0a8172 100644 --- a/README.textile +++ b/README.textile @@ -1,5 +1,6 @@ h1. Chouette2 !https://travis-ci.org/dryade/chouette2.png?branch=master!:https://travis-ci.org/dryade/chouette2 !https://codeclimate.com/badge.png!:https://codeclimate.com/github/dryade/ninoxe -h2. License + +h2. Licence Copyright "AFIMB":http://www.developpement-durable.gouv.fr/Presentation-de-l-AFIMB.html diff --git a/config/database.yml.travis b/config/database.yml.travis index 0335bca94..27552cbec 100644 --- a/config/database.yml.travis +++ b/config/database.yml.travis @@ -1,5 +1,5 @@ test: - adapter: jdbcpostgresql + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> encoding: utf8 username: postgres
\ No newline at end of file |