language: ruby
rvm:
  - 2.0.0
before_script:
  - "export DISPLAY=:99.0"
  - "sh -e /etc/init.d/xvfb start"
  - "cp ./config/travis_database.yml ./config/database.yml"
  - "bundle exec rake db:setup"
  - "bundle exec rake db:test:prepare"
  - "bundle exec rake sunspot:solr:start"

script: "bundle exec rake cucumber"

language: ruby
cache: bundler
rvm:
  - 2.0.0
before_script:
  - "export DISPLAY=:99.0"
  - "sh -e /etc/init.d/xvfb start"
  - "cp ./config/travis_database.yml ./config/database.yml"
  - "mkdir -p tmp/cache"
  - "bundle exec rake db:setup"
  - "bundle exec rake db:test:prepare"
  - "bundle exec rake sunspot:solr:start"

script: "bundle exec rake cucumber"

Add cache for bundler, creates tmp/cache directory to avoid an error on the build
Add cache for bundler, creates tmp/cache directory to avoid an error on the build

Conflicts:
	.travis.yml
