diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index 72b65fbb1..0d996c0d4 100644 --- a/scripts/install_package.cmd +++ b/scripts/install_package.cmd @@ -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 ... diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 77b5d5688..e6c339e95 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -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): """ diff --git a/tir/version.py b/tir/version.py index 9815762fe..df2041b4f 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.30' +__version__ = '1.20.31rc1'