diff options
| author | Michel Etienne | 2012-10-15 11:12:46 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-10-15 11:12:46 +0200 |
| commit | 062eb89a3c5f78c83c858922174da8e9972dcf6a (patch) | |
| tree | 4cc19e6d3e19d7ef3ba41228a18aae892e3dc10e | |
| parent | ab8549741834691c2a19dec2169b987e60ecc261 (diff) | |
| download | chouette-core-062eb89a3c5f78c83c858922174da8e9972dcf6a.tar.bz2 | |
resolve GIT_BRANCH test
| -rw-r--r-- | config/database.yml.ccontrol | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol index 48e2764af..1e918cf00 100644 --- a/config/database.yml.ccontrol +++ b/config/database.yml.ccontrol @@ -7,7 +7,7 @@ development: test: adapter: jdbcpostgresql - database: <%= ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> + database: <%= ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> encoding: utf8 username: chouette password: chouette diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7f465ca11..d18359ce0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' -ENV["RAILS_ENV"] ||= 'test' +ENV["RAILS_ENV"] = 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'rspec/autorun' |