diff --git a/JDI/web/selenium/driver/web_driver_provider.py b/JDI/web/selenium/driver/web_driver_provider.py index e88acc5..3869a61 100644 --- a/JDI/web/selenium/driver/web_driver_provider.py +++ b/JDI/web/selenium/driver/web_driver_provider.py @@ -7,5 +7,5 @@ class WebDriverProvider: @staticmethod def get_chrome_driver_path(): - chrome = "/chromedriver.exe" if sys.platform.startswith("win") else "chromedriver" + chrome = ".\chromedriver.exe" if sys.platform.startswith("win") else "chromedriver" return os.path.join(JDISettings.get_driver_path(), chrome) diff --git a/jdi.properties b/jdi.properties index 7bd6377..5a2a41f 100644 --- a/jdi.properties +++ b/jdi.properties @@ -3,5 +3,6 @@ driver=chrome domain=https://jdi-framework.github.io/tests timeout_wait_element=5 timeout_wait_pageLoad=5 -drivers_folder=.\ +;/drivers_folder=.\ +drivers_folder=C:\Users\Andrei_Zhidelev\projects\jdi-python\ driver_getLatest=true \ No newline at end of file diff --git a/tests/jdi_uitests_webtests/test/common/button_test.py b/tests/jdi_uitests_webtests/test/common/button_test.py index d08818a..d3c7af7 100644 --- a/tests/jdi_uitests_webtests/test/common/button_test.py +++ b/tests/jdi_uitests_webtests/test/common/button_test.py @@ -3,18 +3,14 @@ from JDI.jdi_assert.testing.assertion import Assert from tests.jdi_uitests_webtests.main.enums.preconditions import Preconditions from tests.jdi_uitests_webtests.main.page_objects.epam_jdi_site import EpamJDISite -from tests.jdi_uitests_webtests.test.init_tests import InitTests @pytest.mark.web -class ButtonTests(InitTests): +class TestButton: button = EpamJDISite.metals_colors_page.calculate_button - def setUp(self): - super(ButtonTests, self).setUp(self.id().split(".")[-1]) + def test_click(self, epam_site): Preconditions.METALS_AND_COLORS_PAGE.is_in_state() - - def test_click(self): self.button.click() Assert.assert_element_test(self.button, "CALCULATE") diff --git a/tests/jdi_uitests_webtests/test/complex/dropdown_test.py b/tests/jdi_uitests_webtests/test/complex/dropdown_test.py index 99f3907..a356068 100644 --- a/tests/jdi_uitests_webtests/test/complex/dropdown_test.py +++ b/tests/jdi_uitests_webtests/test/complex/dropdown_test.py @@ -5,13 +5,12 @@ from tests.jdi_uitests_webtests.main.enums.preconditions import Preconditions from tests.jdi_uitests_webtests.main.page_objects.epam_jdi_site import EpamJDISite from tests.jdi_uitests_webtests.main.utils.common_action_data import CommonActionsData -from tests.jdi_uitests_webtests.test.init_tests import InitTests MSG = "Colors: value changed to Blue" @pytest.fixture(params=[True, False], ids=["Dropdown", "Dropdown expanded"]) -def dropdown_setup(request, site): +def dropdown_setup(request, epam_site): dropdown = EpamJDISite.metals_colors_page.color_dropdown Preconditions.METALS_AND_COLORS_PAGE.is_in_state() if request.param: diff --git a/tests/jdi_uitests_webtests/test/complex/radio_button_selector_test.py b/tests/jdi_uitests_webtests/test/complex/radio_button_selector_test.py index 613b917..08537cb 100644 --- a/tests/jdi_uitests_webtests/test/complex/radio_button_selector_test.py +++ b/tests/jdi_uitests_webtests/test/complex/radio_button_selector_test.py @@ -1,18 +1,20 @@ +import pytest + from JDI.jdi_assert.testing.assertion import Assert from tests.jdi_uitests_webtests.main.enums.entities import Odds from tests.jdi_uitests_webtests.main.enums.preconditions import Preconditions -from tests.jdi_uitests_webtests.main.page_objects.epam_jdi_site import EpamJDISite -from tests.jdi_uitests_webtests.main.page_objects.sections.summary import SelectorSummary -from tests.jdi_uitests_webtests.main.utils.common_action_data import CommonActionsData -from tests.jdi_uitests_webtests.test.init_tests import InitTests +from tests.jdi_uitests_webtests.main.page_objects.epam_jdi_site import \ + EpamJDISite +from tests.jdi_uitests_webtests.main.page_objects.sections.summary import \ + SelectorSummary +from tests.jdi_uitests_webtests.main.utils.common_action_data import \ + CommonActionsData MSG = "Summary (Odd): value changed to 7" -import pytest - @pytest.fixture -def selector_site(site): +def selector_site(epam_site): Preconditions.METALS_AND_COLORS_PAGE.is_in_state() diff --git a/tests/jdi_uitests_webtests/test/conftest.py b/tests/jdi_uitests_webtests/test/conftest.py index d630999..8ed01c4 100644 --- a/tests/jdi_uitests_webtests/test/conftest.py +++ b/tests/jdi_uitests_webtests/test/conftest.py @@ -1,5 +1,4 @@ import logging -import unittest import pytest @@ -14,7 +13,7 @@ @pytest.fixture(scope="class") -def site(): +def epam_site(): WebSite.init(EpamJDISite) logger.info("Run Tests from '{}' file".format(__name__)) EpamJDISite.home_page.open() diff --git a/utils/get_driver.py b/utils/get_driver.py index 2098247..8fa711c 100644 --- a/utils/get_driver.py +++ b/utils/get_driver.py @@ -34,6 +34,6 @@ def compose_download_link(build) -> str: if __name__ == "__main__": - release = get_last_release("87.0.4280") + release = get_last_release("90.0.4430") download_link = compose_download_link(build=release) download_driver(download_link)