From 33d74277d0165e5d55c074cfee67c05b47558c79 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Thu, 10 Apr 2014 11:59:24 +0200
Subject: [PATCH] Make the travis log shorter, enable coveralls rails mode

---
 .travis.yml         | 13 +++++++------
 spec/spec_helper.rb |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79659a19..c52455ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,13 @@ notifications:
   email:
     on_success: change
     on_failure: change
-script:
-  - "cp config/database.yml.example config/database.yml"
-  - "cp config/config.yml.example config/config.yml"
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+before_script:
+  - cp config/database.yml.example config/database.yml
+  - cp config/config.yml.example config/config.yml
   - RAILS_ENV=test bundle exec rake db:migrate --trace
   - bundle exec rake db:test:prepare
+script:
   - bundle exec rake spec
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ed78be5a..5b6b9b08 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,9 @@
+require 'coveralls'
+Coveralls.wear!('rails')
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'coveralls'
-Coveralls.wear!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are