From 71b26bbda2e6786742907102318df9450cf48840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Cervi=C3=B1o?= <jcervino@dit.upm.es>
Date: Thu, 24 Oct 2013 20:35:25 +0200
Subject: [PATCH 1/2] increased testacular timeout

---
 .travis/testacular.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/testacular.conf.js b/.travis/testacular.conf.js
index 223edd2519..0fc7e68f92 100644
--- a/.travis/testacular.conf.js
+++ b/.travis/testacular.conf.js
@@ -59,7 +59,7 @@ browsers = [".travis/chrome-start.sh"];
 
 // If browser does not capture in given timeout [ms], kill it
 // CLI --capture-timeout 5000
-captureTimeout = 10000;
+captureTimeout = 60000;
 
 // Auto run tests on start (when browsers are captured) and exit
 // CLI --single-run --no-single-run
@@ -72,4 +72,4 @@ reportSlowerThan = 500;
 // compile coffee scripts
 preprocessors = {
   '**/*.coffee': 'coffee'
-};
\ No newline at end of file
+};

From d339936c61d0feaff37028d81f34a7021492853e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Cervi=C3=B1o?= <jcervino@dit.upm.es>
Date: Thu, 24 Oct 2013 21:31:50 +0200
Subject: [PATCH 2/2] Resolved error with chrome configuration

---
 .travis/chrome-start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/chrome-start.sh b/.travis/chrome-start.sh
index ba58139c6b..6747fd8dda 100755
--- a/.travis/chrome-start.sh
+++ b/.travis/chrome-start.sh
@@ -19,4 +19,4 @@ mkdir -p $USER_DIR"/Default/"
 cp .travis/Preferences $USER_DIR"/Default/"
 
 # Execute the command
-exec "$CMD" --user-data-dir="$USER_DIR" --no-default-browser-check --no-first-run --disable-default-apps --use-fake-ui-for-media-stream "$@"
\ No newline at end of file
+exec "$CMD" --no-first-run --use-fake-ui-for-media-stream "$@"