Skip to content

Commit

Permalink
Replace mark.viewport('mobile') with selenium_mobile fixture
Browse files Browse the repository at this point in the history
  • Loading branch information
jgmize committed Jun 29, 2019
1 parent cabdd15 commit 65770c2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
18 changes: 8 additions & 10 deletions tests/functional/conftest.py
Expand Up @@ -4,10 +4,6 @@

import pytest

VIEWPORT = {
'desktop': {'width': 1280, 'height': 1024},
'mobile': {'width': 320, 'height': 480}}


@pytest.fixture
def capabilities(request, capabilities):
Expand Down Expand Up @@ -59,10 +55,12 @@ def filter_capabilities(request):


@pytest.fixture
def selenium(request, selenium):
viewport = VIEWPORT['desktop']
request_keywords_viewport = request.keywords.get('viewport')
if hasattr(request_keywords_viewport, 'args'):
viewport = VIEWPORT[request_keywords_viewport.args[0]]
selenium.set_window_size(viewport['width'], viewport['height'])
def selenium(selenium):
selenium.set_window_size(1280, 1024) # width, height
return selenium


@pytest.fixture
def selenium_mobile(selenium):
selenium.set_window_size(320, 480) # width, height
return selenium
6 changes: 2 additions & 4 deletions tests/functional/test_contact.py
Expand Up @@ -66,8 +66,7 @@ def test_communities_region_menus(slug, base_url, selenium):


@pytest.mark.nondestructive
@pytest.mark.viewport('mobile')
def test_spaces_mobile_navigation(base_url, selenium):
def test_spaces_mobile_navigation(base_url, selenium_mobile):
page = SpacesPage(selenium, base_url, slug='').open()
assert not page.is_desktop_nav_displayed
assert page.is_mobile_nav_displayed
Expand All @@ -77,8 +76,7 @@ def test_spaces_mobile_navigation(base_url, selenium):


@pytest.mark.nondestructive
@pytest.mark.viewport('mobile')
def test_communities_mobile_navigation(base_url, selenium):
def test_communities_mobile_navigation(base_url, selenium_mobile):
page = CommunitiesPage(selenium, base_url, slug='').open()
assert not page.is_desktop_nav_displayed
assert page.is_mobile_nav_displayed
Expand Down
3 changes: 1 addition & 2 deletions tests/functional/test_history.py
Expand Up @@ -16,8 +16,7 @@ def test_slideshow_displayed(base_url, selenium):


@pytest.mark.nondestructive
@pytest.mark.viewport('mobile')
def test_list_displayed(base_url, selenium):
def test_list_displayed(base_url, selenium_mobile):
page = HistoryPage(selenium, base_url).open()
assert not page.is_slideshow_displayed
assert not page.is_previous_button_displayed
Expand Down
3 changes: 1 addition & 2 deletions tests/functional/test_navigation.py
Expand Up @@ -23,8 +23,7 @@ def test_navigation(base_url, selenium):


@pytest.mark.nondestructive
@pytest.mark.viewport('mobile')
def test_mobile_navigation(base_url, selenium):
def test_mobile_navigation(base_url, selenium_mobile):
page = HomePage(selenium, base_url).open()
page.navigation.show()
firefox_desktop_page = page.navigation.open_firefox_desktop_page()
Expand Down

0 comments on commit 65770c2

Please sign in to comment.