From a6d5fe68cb8f5fc8171db4bc2b6988c07bc12ec0 Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Tue, 6 Sep 2011 15:27:23 +0200
Subject: [PATCH] no need to install firefox on travis anymore; no need to come
 up with custom Xvfb init script anymore; lets try out travis notifications

---
 .travis.yml                | 10 +++++++++-
 config/ci/before-travis.sh |  5 -----
 config/ci/xvfb             | 28 ----------------------------
 3 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 config/ci/xvfb

diff --git a/.travis.yml b/.travis.yml
index 9f29ee72e..f314f0f0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,12 @@ branches:
     - master
 
 notifications:
-  disable: true
+  email:
+    on_success: change
+    on_failure: all
+  irc:
+    on_success: all
+    on_failure: all
+    channels:
+      - 'irc.freenode.org#diaspora-dev'
+      - 'irc.freenode.org#diaspora-de'
diff --git a/config/ci/before-travis.sh b/config/ci/before-travis.sh
index 10a3df4b5..0122fc649 100755
--- a/config/ci/before-travis.sh
+++ b/config/ci/before-travis.sh
@@ -5,13 +5,8 @@ export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_GC_MALLOC_LIMIT=1000000000
 export RUBY_HEAP_FREE_MIN=500000
 
-# Install firefox 
-echo "Installing Firefox"
-sudo aptitude --quiet=2 --without-recommends --assume-yes install firefox
 
 # Start xvfb in preparation for cucumber & jasmine
-echo "Starting Xvfb"
-sudo cp config/ci/xvfb /etc/init.d/xvfb
 sh -e /etc/init.d/xvfb start
 
 # Regenerate css files
diff --git a/config/ci/xvfb b/config/ci/xvfb
deleted file mode 100644
index 97be37b90..000000000
--- a/config/ci/xvfb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2010, Diaspora Inc.  This file is
-# licensed under the Affero General Public License version 3 or later.  See
-# the COPYRIGHT file.
-
-XVFB=/usr/bin/Xvfb
-XVFBARGS=":99 -ac -screen 0 1024x768x16"
-PIDFILE=/tmp/cucumber_xvfb_99.pid
-case "$1" in
-  start)
-    echo -n "Starting virtual X frame buffer: Xvfb"
-    /sbin/start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS
-    echo "."
-    ;;
-  stop)
-    echo -n "Stopping virtual X frame buffer: Xvfb"
-    /sbin/start-stop-daemon --stop --quiet --pidfile $PIDFILE
-    rm -f $PIDFILE
-    echo "."
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-  echo "Usage: /etc/init.d/xvfb {start|stop|restart}"
-  exit 1
-esac
-exit 0
\ No newline at end of file