From b54c2b8de964d1a48ef955d858e51d2420d3a110 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 20 Feb 2015 18:17:35 +0900 Subject: [PATCH] Connect to PostgreSQL DB as postgres user because root user is no more available in Travis since 0af5e2eec078aef53d54fbf6f0d4c8077fec8ae8, we'd better use postgres user in the tests --- CONTRIBUTING.md | 2 +- spec/support/activerecord.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcd8a77c7..35a7657b1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,4 +34,4 @@ Please test with the latest Ruby 1.8.x and 1.9.x versions using RVM if possible. ## Running active record tests Make sure you have a local PostgreSQL database named `carrierwave_test` with the username -`root` and empty password. +`postgres` diff --git a/spec/support/activerecord.rb b/spec/support/activerecord.rb index 9c34ee89c..af34d4eaf 100644 --- a/spec/support/activerecord.rb +++ b/spec/support/activerecord.rb @@ -10,7 +10,8 @@ dbconfig = { :adapter => 'postgresql', :database => 'carrierwave_test', - :encoding => 'utf8' + :encoding => 'utf8', + :username => 'postgres' } database = dbconfig.delete(:database)