Skip to content

Commit

Permalink
Merge pull request #429 from totvs/hotfix/blocker-setlateralmenu
Browse files Browse the repository at this point in the history
Hotfix/blocker setlateralmenu
  • Loading branch information
Wilson08 authored Oct 20, 2020
2 parents d5e4c85 + 4eb5873 commit bad6d7a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 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.22.tar.gz
pip install -U dist/tir_framework-1.17.23.tar.gz
pause >nul | set/p = Press any key to exit ...
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
project_urls={
'Script Samples': 'https://github.com/totvs/tir-script-samples'
},
version='1.17.22',
version='1.17.23',
license='MIT',
keywords='test automation selenium tir totvs protheus framework',
classifiers=[
Expand Down
5 changes: 3 additions & 2 deletions tir/technologies/webapp_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -1338,15 +1338,15 @@ def wait_blocker(self):
Wait blocker disappear
"""
blocker_container = None
blocker = None

print("Waiting blocker to continue...")
soup = None
result = True
endtime = time.time() + 300

while(time.time() < endtime and result):
blocker_container = None
blocker = None
soup = self.get_current_DOM()
blocker_container = self.blocker_containers(soup)
if blocker_container:
Expand Down Expand Up @@ -2407,6 +2407,7 @@ def SetLateralMenu(self, menu_itens, save_input=True):
count = 0
try:
for menuitem in menu_itens:
self.wait_blocker()
self.wait_until_to(expected_condition="element_to_be_clickable", element = ".tmenu", locator=By.CSS_SELECTOR )
self.wait_until_to(expected_condition="presence_of_all_elements_located", element = ".tmenu .tmenuitem", locator = By.CSS_SELECTOR )
menuitem_presence = self.wait_element_timeout(term=menuitem, scrap_type=enum.ScrapType.MIXED, timeout = self.config.time_out, optional_term=".tmenuitem", main_container="body")
Expand Down

0 comments on commit bad6d7a

Please sign in to comment.