diff --git a/Dockerfile-selenium b/Dockerfile-selenium index b8f0da1b39d4..3dc9c3c4b345 100644 --- a/Dockerfile-selenium +++ b/Dockerfile-selenium @@ -1,7 +1,7 @@ # Copyright (C) 2018 Google Inc. # Licensed under http://www.apache.org/licenses/LICENSE-2.0 -ARG CHROME_CT_VERSION="3.11.0" +ARG CHROME_CT_VERSION="3.13.0" FROM selenium/standalone-chrome:${CHROME_CT_VERSION} USER root @@ -19,7 +19,7 @@ USER seluser # Specify version of Chrome webdriver using 'CHROME_DRIVER_VERSION' argument # Latest released version will be used by default -ARG CHROME_DRIVER_VERSION="2.37" +ARG CHROME_DRIVER_VERSION="2.41" RUN CD_VER=$(if [ ${CHROME_DRIVER_VERSION:-latest} = "latest" ]; then echo\ $(wget -qO- https://chromedriver.storage.googleapis.com/LATEST_RELEASE); \ else echo $CHROME_DRIVER_VERSION; fi) \ diff --git a/src/requirements-selenium.txt b/src/requirements-selenium.txt index f7c32c8c89c5..c8b721414582 100644 --- a/src/requirements-selenium.txt +++ b/src/requirements-selenium.txt @@ -3,16 +3,16 @@ inflection==0.3.1 nerodia==0.9.0 -pytest==3.5.0 +pytest==3.6.4 pytest-cov==2.5.1 pytest-env==0.6.2 -pytest-html==1.17.0 +pytest-html==1.19.0 pytest-pycharm==0.5.0 -pytest-repeat==0.4.1 -pytest-rerunfailures==4.0 -pytest-selenium==1.12.0 -pytest-xdist==1.22.2 -python-dateutil==2.7.1 -requests==2.18.4 -selenium==3.11.0 +pytest-repeat==0.6.0 +pytest-rerunfailures==4.1 +pytest-selenium==1.13.0 +pytest-xdist==1.22.5 +python-dateutil==2.7.3 +requests==2.19.1 +selenium==3.14.0 waiting==1.4.1 \ No newline at end of file diff --git a/test/selenium/src/lib/utils/selenium_utils.py b/test/selenium/src/lib/utils/selenium_utils.py index 254c43862a36..fb242354f672 100644 --- a/test/selenium/src/lib/utils/selenium_utils.py +++ b/test/selenium/src/lib/utils/selenium_utils.py @@ -352,16 +352,9 @@ def set_chrome_download_location(driver, download_dir): """Headless Chrome doesn't support download.default_directory preference. Downloads are disallowed by default. In order to allow a download we should send a command that will allow them. - Language bindings currently don't have this possibility. """ - # pylint: disable=protected-access - driver.command_executor._commands["send_command"] = ( - "POST", "/session/{}/chromium/send_command".format(driver.session_id)) - params = { - "cmd": "Page.setDownloadBehavior", - "params": {"behavior": "allow", "downloadPath": download_dir} - } - driver.execute("send_command", params) + cmd_args = {"behavior": "allow", "downloadPath": download_dir} + driver.execute_cdp_cmd("Page.setDownloadBehavior", cmd_args) def is_headless_chrome(pytestconfig):