Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.20.30.tar.gz
pip install -U dist/tir_framework-1.20.31rc1.tar.gz
pause >nul | set/p = Press any key to exit ...
33 changes: 23 additions & 10 deletions tir/technologies/webapp_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,24 +405,37 @@ def program_screen(self, initial_program="", environment="", poui=False):
>>> self.program_screen("SIGAADV", "MYENVIRONMENT")
"""

wizard_screen = []

if not environment:
environment = self.config.environment

if self.config.coverage:
self.open_url_coverage(url=self.config.url, initial_program=initial_program,
environment=environment)

self.config.poui_login = poui
endtime = time.time() + 10

self.filling_initial_program(initial_program)
self.filling_server_environment(environment)
while time.time() - endtime and not wizard_screen:
wizard_screen = self.web_scrap(term=self.language.next, scrap_type=enum.ScrapType.TEXT,
optional_term=".wa-button, wa-text-view",
main_container=self.containers_selectors["AllContainers"],
check_help=False, check_error=False)

if self.webapp_shadowroot():
self.wait_until_to(expected_condition = "element_to_be_clickable", element=".startParameters", locator = By.CSS_SELECTOR)
parameters_screen = self.driver.find_element(By.CSS_SELECTOR, ".startParameters")
buttons = self.find_shadow_element('wa-button', parameters_screen)
button = next(iter(list(filter(lambda x: 'ok' in x.text.lower().strip(), buttons))), None)
else:
button = self.driver.find_element(By.CSS_SELECTOR, ".button-ok")
if not wizard_screen:
self.filling_initial_program(initial_program)
self.filling_server_environment(environment)

if self.webapp_shadowroot():
self.wait_until_to(expected_condition = "element_to_be_clickable", element=".startParameters", locator = By.CSS_SELECTOR)
parameters_screen = self.driver.find_element(By.CSS_SELECTOR, ".startParameters")
buttons = self.find_shadow_element('wa-button', parameters_screen)
button = next(iter(list(filter(lambda x: 'ok' in x.text.lower().strip(), buttons))), None)
else:
button = self.driver.find_element(By.CSS_SELECTOR, ".button-ok")

self.click(button)
self.click(button)

def filling_initial_program(self, initial_program):
"""
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.20.30'
__version__ = '1.20.31rc1'
Loading