Merge branch 'master' of github.com:ging/licode

lynckia · Oct 24, 2013 · 7930b5f · 7930b5f
2 parents ea9a937 + d339936
commit 7930b5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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 "$@"
+exec "$CMD" --no-first-run --use-fake-ui-for-media-stream "$@"
diff --git 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'
-};
+};