Skip to content

Commit

Permalink
travis setup
Browse files Browse the repository at this point in the history
  • Loading branch information
roberto committed Aug 21, 2012
1 parent 85dbea1 commit 1762d8e
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -14,4 +14,3 @@
/log/*.log
/tmp

/config/database.yml
14 changes: 14 additions & 0 deletions .travis.yml
@@ -0,0 +1,14 @@
language: ruby
rvm:
- 1.9.3
bundler_args: --without development
env:
- DB=sqlite
- DB=postgresql
script:
- bundle exec rspec
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- psql -c 'create database lentlist_test' -U postgres
- RAILS_ENV=test bundle exec rake db:migrate
8 changes: 4 additions & 4 deletions Gemfile
Expand Up @@ -29,22 +29,22 @@ gem 'rails_bootstrap_navbar'
gem 'kaminari'

group :test, :development do
gem 'annotate'
gem 'rspec-rails'
gem 'sqlite3'
gem "guard"
gem 'terminal-notifier'
end

group :test do
gem 'shoulda-matchers'
gem "factory_girl_rails"
gem "capybara"
gem "guard-rspec"
end


group :development do
gem "guard"
gem "guard-rspec"
gem 'annotate'
gem 'terminal-notifier'
gem 'guard-pow'
end

Expand Down
32 changes: 32 additions & 0 deletions config/database.yml
@@ -0,0 +1,32 @@
sqlite: &sqlite
adapter: sqlite3
database: db/<%= Rails.env %>.sqlite3

postgresql: &postgresql
adapter: postgresql
username: postgres
password:
database: lentlist_<%= Rails.env %>
min_messages: ERROR

defaults: &defaults
pool: 5
timeout: 5000
host: localhost
<<: *<%= ENV['DB'] || "postgresql" %>

development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000

test:
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000

production:
<<: *defaults

0 comments on commit 1762d8e

Please sign in to comment.