Skip to content

Commit

Permalink
Merge branch 'develop' into feature/fill-grid-memo
Browse files Browse the repository at this point in the history
  • Loading branch information
renanllisboa committed Aug 3, 2021
2 parents 99f6c11 + a008b89 commit e24fec5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/install_package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ taskkill /f /im chromedriver.exe
echo -------------------------
echo Installing project...
echo -------------------------
pip install -U dist/tir_framework-1.17.51rc7.tar.gz
pip install -U dist/tir_framework-1.17.51rc8.tar.gz
pause >nul | set/p = Press any key to exit ...
8 changes: 8 additions & 0 deletions tir/technologies/webapp_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2677,6 +2677,7 @@ def SetLateralMenu(self, menu_itens, save_input=True):
child = list(filter(lambda x: x.text.startswith(menuitem) and EC.element_to_be_clickable((By.XPATH, xpath_soup(x))), subMenuElements))[0]
submenu = lambda: self.driver.find_element_by_xpath(xpath_soup(child))
if subMenuElements and submenu():
self.expanded_menu(child)
self.scroll_to_element(submenu())
self.wait_until_to( expected_condition = "element_to_be_clickable", element = child, locator = By.XPATH )
self.wait_blocker()
Expand Down Expand Up @@ -2738,6 +2739,13 @@ def SetLateralMenu(self, menu_itens, save_input=True):
self.restart_counter += 1
self.log_error(str(error))

def expanded_menu(self, element):
expanded = lambda: True if "expanded" in element.attrs['class'] else False
if expanded():
parent_menu = self.driver.find_element_by_xpath(xpath_soup(element.select('label')[0]))
self.wait_blocker()
ActionChains(self.driver).move_to_element(parent_menu).click().perform()

def tmenuitem_element(self, menu):
subMenuElements = menu.select(".tmenuitem")
subMenuElements = list(filter(lambda x: self.element_is_displayed(x), subMenuElements))
Expand Down
2 changes: 1 addition & 1 deletion tir/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.17.51rc7'
__version__ = '1.17.51rc8'

0 comments on commit e24fec5

Please sign in to comment.