From e19b456e924af13d0c7b6945a4e831d1e35a40f9 Mon Sep 17 00:00:00 2001
From: David Morley <dia@z8s.com>
Date: Wed, 28 Dec 2011 10:13:52 -0600
Subject: [PATCH] ex display

---
 .travis.yml       | 2 +-
 phpunit/before.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecd79ff..ebf14fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ php:
   - 5.4
 
 before_script: "./phpunit/before.sh"
-#script: export DISPLAY=:99.0 && phpunit
+script: export DISPLAY=:99.0 && phpunit
 
 notifications:
   irc: "irc.freenode.org#diasporg"
\ No newline at end of file
diff --git a/phpunit/before.sh b/phpunit/before.sh
index aa4bacf..6d2957f 100755
--- a/phpunit/before.sh
+++ b/phpunit/before.sh
@@ -1,7 +1,7 @@
 
 sh -e /etc/init.d/xvfb start
-firefox -CreateProfile ./phpunit/ff.profile
+export DISPLAY=:99.0 && firefox -CreateProfile ./phpunit/ff.profile
 wget http://selenium.googlecode.com/files/selenium-server-standalone-2.15.0.jar
-sudo java -jar selenium-server-standalone-2.15.0.jar -firefoxProfileTemplate "./phpunit/ff.profile/"&
+export DISPLAY=:99.0 && sudo java -jar selenium-server-standalone-2.15.0.jar -firefoxProfileTemplate "./phpunit/ff.profile/"&
 pyrus install phpunit/PHPUnit_Selenium
 phpenv rehash
-- 
GitLab