Skip to content

Commit

Permalink
Fixed a DeprecationWarning on selenium >= 3.8.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
D3X authored and davehunt committed Nov 30, 2017
1 parent d53ef2e commit 491eb7b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
11 changes: 10 additions & 1 deletion pytest_selenium/drivers/chrome.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from distutils.version import LooseVersion

import pytest
from selenium import __version__ as SELENIUM_VERSION
from selenium.webdriver.chrome.options import Options


def driver_kwargs(capabilities, driver_args, driver_log, driver_path,
chrome_options, **kwargs):
kwargs = {
'desired_capabilities': capabilities,
'chrome_options': chrome_options}
}

# Selenium 3.8.0 deprecated chrome_options in favour of options
if LooseVersion(SELENIUM_VERSION) < LooseVersion('3.8.0'):
kwargs['chrome_options'] = chrome_options
else:
kwargs['options'] = chrome_options

if driver_args is not None:
kwargs['service_args'] = driver_args
if driver_log is not None:
Expand Down
10 changes: 8 additions & 2 deletions pytest_selenium/drivers/firefox.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

from distutils.version import LooseVersion
import warnings

import pytest
from selenium import __version__ as SELENIUM_VERSION
from selenium.webdriver import FirefoxProfile
from selenium.webdriver.firefox.firefox_binary import FirefoxBinary
from selenium.webdriver.firefox.options import Options
Expand Down Expand Up @@ -54,7 +55,12 @@ def driver_kwargs(capabilities, driver_log, driver_path, firefox_options,
kwargs['log_path'] = driver_log
if driver_path is not None:
kwargs['executable_path'] = driver_path
kwargs['firefox_options'] = firefox_options

# Selenium 3.8.0 deprecated firefox_options in favour of options
if LooseVersion(SELENIUM_VERSION) < LooseVersion('3.8.0'):
kwargs['firefox_options'] = firefox_options
else:
kwargs['options'] = firefox_options
return kwargs


Expand Down

0 comments on commit 491eb7b

Please sign in to comment.