Further tweaks to support Travis

Conflicts:

	.travis.yml

3 files changed, 6 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 28092a80c..a400dd7e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,6 +39,7 @@ gem 'zip'
 group :test do
   gem 'fakeweb'
   gem 'rspec-rails', '~> 1.3.4'
+  gem 'rake'
 end
 
 group :develop do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c002e6c2..cf21dc0ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,6 +85,7 @@ DEPENDENCIES
   pg
   rack (~> 1.1.0)
   rails (= 2.3.14)
+  rake
   rdoc (~> 2.4.3)
   recaptcha (~> 0.3.1)
   rmagick
diff --git a/config/database.yml-test b/config/database.yml-test
new file mode 100644
index 000000000..ff6e2013a
--- /dev/null
+++ b/config/database.yml-test
@@ -0,0 +1,4 @@
+test:
+  adapter: postgresql
+  database: foi_test
+  username: postgres