language: ruby
rvm:
  - 2.1.2
script:
  - xvfb-run bundle exec rake spec
before_script:
  - cp config/database.yml.travis config/database.yml
  - psql -c 'create database test;' -U postgres
  - ! 'RAILS_ENV=test bundle exec rake db:schema:load || :'
addons:
  firefox: "35.0.1"
  postgresql: "9.3"
env:
  FOG_DIRECTORY=empirical-core-travis-test
  PROGRESS_REPORT_FOG_DIRECTORY=empirical-progress-report-travis-test

language: ruby
rvm:
  - 2.1.2
script:
  - bundle exec rake spec
before_script:
  - cp config/database.yml.travis config/database.yml
  - psql -c 'create database test;' -U postgres
  - ! 'RAILS_ENV=test bundle exec rake db:schema:load || :'
addons:
  postgresql: "9.3"
env:
  FOG_DIRECTORY=empirical-core-travis-test
  PROGRESS_REPORT_FOG_DIRECTORY=empirical-progress-report-travis-test

Remove Travis config obviated by headless testing
Remove Travis config obviated by headless testing

- don't need to run specs under xvfb-run (undo 5844977)
- don't need Firefox any more, much less any specific version (undo 6b12068)
