From 8ee0124a7b07a7ab9a38748bb3b10d5f79dcff2b Mon Sep 17 00:00:00 2001
From: Steve Kenworthy <steveyken@gmail.com>
Date: Thu, 16 Feb 2012 16:02:13 +0800
Subject: [PATCH] Added required parameter 'language' to travis config and
 ensured headless is started in travis environment.

---
 .travis.yml                          | 1 +
 spec/acceptance/acceptance_helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4881006e54..72cae5dbcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
diff --git a/spec/acceptance/acceptance_helper.rb b/spec/acceptance/acceptance_helper.rb
index 1bc63a0de1..88959d8c41 100644
--- a/spec/acceptance/acceptance_helper.rb
+++ b/spec/acceptance/acceptance_helper.rb
@@ -10,7 +10,7 @@
 # https://github.com/binarylogic/authlogic/issues/262#issuecomment-1804988
 User.acts_as_authentic_config[:maintain_sessions] = false
 
-if ENV['HEADLESS'] == 'true'
+if ENV['HEADLESS'] == 'true' or ENV["CI"] == "true"
   require 'headless'
   headless = Headless.new
   headless.start