From 6bafa98e1502ea28ad23591c05ec0ddb7d82961b Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sat, 25 Jul 2015 13:43:15 +0200 Subject: [PATCH 1/2] Pin Google Chrome to version 43 for now. See: - https://www.drupal.org/node/2537902 - http://cgit.drupalcode.org/panopoly/commit/?id=d3d0bd0 - https://github.com/minkphp/MinkSelenium2Driver/issues/213 - https://code.google.com/p/chromium/issues/detail?id=513728 --- functions/behat.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/behat.sh b/functions/behat.sh index 68484cf..2301c2d 100644 --- a/functions/behat.sh +++ b/functions/behat.sh @@ -88,7 +88,9 @@ function drupal_ti_ensure_chrome() { ( cd $DRUPAL_TI_DIST_DIR # @todo Make version configurable. - wget -O google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + # wget -O google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + # @todo Do not pin to Chrome 43.0. + wget -O google-chrome-stable_current_amd64.deb http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_43.0.2357.134-1_amd64.deb dpkg -x google-chrome-stable_current_amd64.deb . ) drupal_ti_ensure_bin_dir From a893848cb8e27fde3dc68dcfdf5adfc3af4264ef Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Sat, 25 Jul 2015 14:12:04 +0200 Subject: [PATCH 2/2] Make download url configurable instead. --- functions/behat.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/functions/behat.sh b/functions/behat.sh index 2301c2d..20ae108 100644 --- a/functions/behat.sh +++ b/functions/behat.sh @@ -84,13 +84,16 @@ function drupal_ti_ensure_chrome() { return fi + # @todo Move to defaults API. + if [ -z "$DRUPAL_TI_BEHAT_CHROME_URL" ] + then + DRUPAL_TI_BEHAT_CHROME_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" + fi + drupal_ti_ensure_apt_get ( cd $DRUPAL_TI_DIST_DIR - # @todo Make version configurable. - # wget -O google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - # @todo Do not pin to Chrome 43.0. - wget -O google-chrome-stable_current_amd64.deb http://mirror.pcbeta.com/google/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_43.0.2357.134-1_amd64.deb + wget -O google-chrome-stable_current_amd64.deb "$DRUPAL_TI_BEHAT_CHROME_URL" dpkg -x google-chrome-stable_current_amd64.deb . ) drupal_ti_ensure_bin_dir