openstack/horizon
Code Issues Proposed changes

Merge "Wait for user menu items to become visible before clicking them"

Browse Source
This commit is contained in:
Jenkins 2016-04-27 18:32:24 +00:00 committed by Gerrit Code Review
commit 75c207b0c9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/test/integration_tests/basewebobject.py
View File

@ -124,9 +124,8 @@ class BaseWebObject(unittest.TestCase):
return self._wait_until(predicate, timeout)
def _wait_till_element_visible(self, element, timeout=None):
self._wait_until(lambda x: self._is_element_displayed(element),
timeout)
def _wait_till_element_visible(self, locator, timeout=None):
self._wait_until(lambda x: self._is_element_visible(*locator), timeout)
def _wait_till_element_disappears(self, element, timeout=None):
self._wait_until(lambda x: not self._is_element_displayed(element),

2
openstack_dashboard/test/integration_tests/regions/menus.py
View File

@ -179,6 +179,7 @@ class NavigationAccordionRegion(baseregion.BaseRegion):
class DropDownMenuRegion(baseregion.BaseRegion):
"""Drop down menu region."""
_menu_container_locator = (by.By.CSS_SELECTOR, 'ul.dropdown-menu')
_menu_items_locator = (by.By.CSS_SELECTOR,
'ul.dropdown-menu > li > *')
_menu_first_child_locator = (by.By.CSS_SELECTOR,
@ -198,6 +199,7 @@ class DropDownMenuRegion(baseregion.BaseRegion):
"""Opens menu by clicking on the first child of the source element."""
if self.is_open() is False:
self._get_element(*self._menu_first_child_locator).click()
self._wait_till_element_visible(self._menu_container_locator)
class UserDropDownMenuRegion(DropDownMenuRegion):