aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorKir2012-04-25 11:47:39 +0300
committerKir2012-04-25 11:47:39 +0300
commit66d10dd18f797dcaa2b9b2d8113cad328086602a (patch)
treefaf1b6818976eee9b9b68c0287814411ca726762 /spec
parent7ceea085c82d6bc3e373160167a62ee4e943a197 (diff)
downloadinboxes-66d10dd18f797dcaa2b9b2d8113cad328086602a.tar.bz2
Fixing test failture
Diffstat (limited to 'spec')
-rw-r--r--spec/fake_app.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/fake_app.rb b/spec/fake_app.rb
index 7e9df7c..29c18dc 100644
--- a/spec/fake_app.rb
+++ b/spec/fake_app.rb
@@ -11,8 +11,11 @@ require 'devise'
require 'devise/orm/active_record'
# database
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'postgresql', :database => 'inboxes_test', :username => "postgres"}}
-# ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+if ENV['TRAVIS'].present?
+ ActiveRecord::Base.configurations = {'test' => {:adapter => 'postgresql', :database => 'inboxes_test', :username => "postgres"}}
+else
+ ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+end
ActiveRecord::Base.establish_connection('test')
# config