Permalink
Browse files

Merge pull request #4 from d1/setup-travis

Setup Travis CI
  • Loading branch information...
d1 committed Apr 16, 2012
2 parents 6963c9a + aa7afb8 commit ca0fc4f11ca1d0e0c0eb3263a8b397bfa4af70dc
Showing with 22 additions and 3 deletions.
  1. +13 −0 .travis.yml
  2. +6 −1 Gemfile
  3. +1 −0 Gemfile.lock
  4. +2 −2 config/database.yml
View
@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+ - 1.9.3
+
+env:
+ - DB=postgresql
+
+before_script:
+ - psql -c 'create database slurryhub_test;' -U postgres
+
+script:
+ - RAILS_ENV=test bundle exec rake --trace db:migrate spec cucumber
+
View
@@ -54,11 +54,16 @@ group :test, :development do
gem 'rspec-rails', '~> 2.9.0'
end
-# Acceptance and Integration Testing
+# Acceptance and Integration Testing
group :test do
gem 'cucumber-rails', '~> 1.3.0'
gem 'capybara'
gem 'factory_girl'
gem 'database_cleaner'
gem 'email_spec'
end
+
+# Travis CI needs rake
+group :test do
+ gem 'rake', '~> 0.9.2'
+end
View
@@ -190,6 +190,7 @@ DEPENDENCIES
omniauth (~> 1.0.3)
pg
rails (= 3.2.2)
+ rake (~> 0.9.2)
rspec-rails (~> 2.9.0)
twitter-bootstrap-rails (~> 2.0.4)
uglifier (>= 1.0.3)
View
@@ -44,7 +44,7 @@ test: &test
encoding: unicode
database: slurryhub_test
pool: 5
- username: slurryhub
+ username: postgres
password:
min_messages: WARNING
@@ -58,4 +58,4 @@ production:
min_messages: WARNING
cucumber:
- <<: *test
+ <<: *test

0 comments on commit ca0fc4f

Please sign in to comment.