Skip to content

Commit

Permalink
remove unnecessary pytest marking, address flake8 issues
Browse files Browse the repository at this point in the history
  • Loading branch information
lmtierney committed Aug 24, 2017
1 parent 3e0e6ff commit 9158232
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions py/selenium/webdriver/remote/webdriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
'platform': 'platformName'
}


def _make_w3c_caps(caps):
"""Makes a W3C alwaysMatch capabilities object.
Expand Down
6 changes: 4 additions & 2 deletions py/test/unit/selenium/webdriver/ie/test_ie_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@

TIMEOUT = 30


@pytest.fixture
def opts():
yield Options()

@pytest.mark.usefixtures('opts')


def test_arguments(opts):
arg1 = '-k'
Expand Down Expand Up @@ -142,17 +141,20 @@ def test_additional_options(opts):
opts.add_additional_option('foo', 'bar')
assert opts.additional_options.get('foo') == 'bar'


def test_to_capabilities(opts):
opts._options['foo'] = 'bar'
assert Options.KEY in opts.to_capabilities()
assert opts.to_capabilities().get(Options.KEY) == opts._options


def test_to_capabilities_arguments(opts):
arg = '-k'
opts.add_argument(arg)
caps_opts = opts.to_capabilities().get(Options.KEY)
assert caps_opts.get(Options.SWITCHES) == arg


def test_to_capabilities_additional_options(opts):
name = 'foo'
value = 'bar'
Expand Down

0 comments on commit 9158232

Please sign in to comment.