Hoping to fix Issue:238 - travis reporting success even when spec fai…

…lures
fatfreecrm · Mar 1, 2013 · 25beda2 · 25beda2
1 parent 666d6a1
commit 25beda2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,12 +22,14 @@ matrix:
 
 bundler_args: --path=vendor/bundle --without heroku
 
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 before_script:
   - sh -c "cp config/database.$DB.yml config/database.yml"
   - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database fat_free_crm_test;' -U postgres; fi"
   - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database fat_free_crm_test;'; fi"
-  - "export DISPLAY=:99"
-  - "sh -e /etc/init.d/xvfb start"
 
 # Run specs
 script: "bundle exec rake"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
     ffaker (1.14.0)
     ffi (1.2.0)
     haml (3.1.7)
-    headless (0.2.2)
+    headless (1.0.1)
     highline (1.6.15)
     hike (1.2.1)
     htmlentities (4.3.1)

diff --git a/spec/acceptance/support/headless.rb b/spec/acceptance/support/headless.rb
@@ -8,8 +8,5 @@
   headless = Headless.new
   headless.start
   HEADLESS_DISPLAY = ":#{headless.display}"
-  at_exit do
-    headless.destroy
-  end
   puts "Running in Headless mode. Display #{HEADLESS_DISPLAY}"
 end