bumped dependencies and changed test site

Author: vklonin

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 ## Getting started
 
 Before you begin:
--   Python 3.8 is used for this project.
+-   Python 3.11 is used for this project.
 -   For EPAM employees only: have you read the [Best Practices for Managing Secrets](https://elearn.epam.com/courses/course-v1:EPAM+5SCSS+0620/courseware/4b94c749c309409ea878fb7916be316b/ae4553f7cd524229b42f260b0ac692ed/1?activate_block_id=block-v1%3AEPAM%2B5SCSS%2B0620%2Btype%40vertical%2Bblock%40c04f1498c7d04ac4bf87b652741d90bb)?
 -   Check out the [existing issues](https://github.com/jdi-testing/jdi-python/issues).
 
@@ -19,10 +19,6 @@ When you're done making changes, open your PR and get it reviewed.
 
 In order to test the project, run pytest.
 
-Please don't forget to set up the environment variable `TEST_PASSWORD`. For example:
-
-For Windows `set TEST_PASSWORD=<password>`
-
 ```bash
 pytest <path to the project>/tests --no-header --no-summary -q
 ```

JDI/core/settings/jdi_settings.py

@@ -1,19 +1,20 @@
+import os
+from pathlib import Path, PurePath
 import logging
-from pathlib import Path
-
-logger = logging.Logger(__name__)
 
+logger = logging.getLogger(__name__)
 
 class PropertyPath:
     def __init__(self, filename="jdi.properties"):
-        self._filename = Path(filename)
+        project_root = Path(__file__).parents[3]
+        self._filename = project_root / filename
 
     def get_property_file(self):
-        logger.info("Directory to search {dir_to_search}".format(dir_to_search=self._filename))
+        logger.info(f"Directory to search {self._filename.parent}")
         if self._filename.exists():
             return self._filename
         else:
-            raise FileNotFoundError("There is not property file with name '" + self._filename + "' in your project")
+            raise FileNotFoundError(f"There is no property file with name '{self._filename}' in your project")
 
 
 class JDISettings:

JDI/web/selenium/driver/selenium_driver_factory.py

@@ -1,14 +1,12 @@
-import os
-
+from selenium.webdriver.chrome.service import Service
 from selenium.webdriver.chrome.options import Options as ChromeOptions
 from selenium.webdriver.chrome.webdriver import WebDriver as ChromeDriver
+from webdriver_manager.chrome import ChromeDriverManager
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-from selenium.webdriver.firefox.options import Options as FirefoxOptions
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteDriver
 
 from JDI.core.settings.jdi_settings import JDISettings
 from JDI.web.selenium.driver.driver_types import DriverTypes
-from JDI.web.selenium.driver.web_driver_provider import WebDriverProvider
 
 
 class SeleniumDriverFactory:
@@ -17,7 +15,6 @@ def __init__(self):
         self.options = None
         self.current_driver = None
         self.browser_size = None
-        self.drivers_path = JDISettings.get_driver_path()
         self.capabilities = {}
 
     def register_driver(self, driver_name, options, capabilities, executor):
@@ -28,24 +25,17 @@ def register_driver(self, driver_name, options, capabilities, executor):
         else:
             if driver_name == DriverTypes.chrome.name:
                 self.current_driver = self.register_chrome_driver()
-            if driver_name == DriverTypes.firefox.name:
-                self.current_driver = self.register_firefox_driver()
         return driver_name
 
     def set_driver_options_and_capabilities(self, driver_name, options, capabilities, executor):
         if driver_name == DriverTypes.chrome.name:
             self.options = ChromeOptions()
-            # TODO: move hardcoded arguments to params
             self.options.add_argument("start-maximized")
             self.options.add_argument("disable-gpu")
-            self.add_options(options) if options else True
-            if not capabilities and executor is not None:
+            if options:
+                self.add_options(options)
+            if not capabilities and executor is None:
                 self.capabilities = DesiredCapabilities.CHROME
-        if driver_name == DriverTypes.firefox.name:
-            self.options = FirefoxOptions()
-            self.add_options(options) if options else True
-            if not capabilities and executor is not None:
-                self.capabilities = DesiredCapabilities.FIREFOX
         if capabilities:
             self.capabilities = capabilities
 
@@ -54,38 +44,28 @@ def add_options(self, options):
             self.options.add_argument(arg)
 
     def register_chrome_driver(self):
-        chrome_driver = WebDriverProvider.get_chrome_driver_path()
-        os.environ["webdriver.chrome.driver"] = chrome_driver
-        return self.__web_driver_settings(ChromeDriver(executable_path=chrome_driver,
-                                                       options=self.options,
-                                                       desired_capabilities=self.capabilities))
-
-    def register_firefox_driver(self):
-        raise NotImplementedError
+        service = Service(ChromeDriverManager().install())
+        return self.__web_driver_settings(ChromeDriver(service=service,
+                                                       options=self.options))
 
     def register_remote_driver(self, executor):
-        chrome_driver = WebDriverProvider.get_chrome_driver_path()
-        os.environ["webdriver.chrome.driver"] = chrome_driver
         driver = self.__web_driver_settings(RemoteDriver(command_executor=executor,
                                                          options=self.options,
-                                                         desired_capabilities=self.capabilities,
                                                          keep_alive=True))
         return driver
 
     def __web_driver_settings(self, driver):
-        if self.browser_size is None:
-            driver.maximize_window()
+        if self.browser_size:
+            driver.set_window_size(*self.browser_size)
         else:
-            driver.set_window_size(self.browser_size)
+            driver.maximize_window()
         driver.implicitly_wait(JDISettings.get_current_timeout_sec())
         return driver
 
     def get_driver(self, options=None, capabilities=None, executor=None):
-        if self.current_driver is not None:
-            return self.current_driver
-        else:
+        if not self.current_driver:
             self.register_driver(driver_name=DriverTypes.chrome.name,
                                  options=options,
                                  capabilities=capabilities,
                                  executor=executor)
-            return self.current_driver
+        return self.current_driver

JDI/web/selenium/driver/web_driver_provider.py

@@ -1,11 +1,9 @@
-import os
+from webdriver_manager.chrome import ChromeDriverManager
 import sys
 
-from JDI.core.settings.jdi_settings import JDISettings
-
-
 class WebDriverProvider:
     @staticmethod
     def get_chrome_driver_path():
-        chrome = "/chromedriver.exe" if sys.platform.startswith("win") else "chromedriver"
-        return os.path.join(JDISettings.get_driver_path(), chrome)
+        chrome = ChromeDriverManager().install()
+        return chrome
+

JDI/web/selenium/elements/common/text_field.py

@@ -11,7 +11,7 @@ def __init__(self, by_locator=None, by_label=None, web_element=None):
     def input(self, text):
         self.input_action(text)
 
-    def input_action(self,text):
+    def input_action(self, text):
         self.get_web_element().send_keys(text)
 
     @scenario(action_name="Send keys to the element")

README.md

@@ -4,3 +4,17 @@
 
 # JDI 2.0
 Powerful Framework for UI Automation Testing on Python
+
+## Getting started
+Before you begin:
+- Python 3.11 is used for this project. To install Python on MacOs you can use [Homebrew](https://brew.sh/), on Windows you can use [Chocolatey](https://chocolatey.org/).
+- run git clone https://github.com/jdi-testing/jdi-python.git or fork the repository and clone it afterwards.
+- create a virtual environment for the project. You can use [virtualenv](https://virtualenv.pypa.io/en/latest/) or [venv](https://docs.python.org/3/library/venv.html) for that.
+- set up Python interpreter to use Python 3.11 in your IDE.
+- run `pip install -r requirements.txt` to install all required dependencies.
+
+## You can simply run tests to see how it works
+1. inside your IDE
+2. using pytest
+ - activate your virtual environment by running `source venv/bin/activate` on MacOs or `venv\Scripts\activate` on Windows
+ - run `pytest` in the terminal

jdi.properties

@@ -1,6 +1,6 @@
 driver=chrome
 ; domain=https://www.epam.com/
-domain=https://jdi-framework.github.io/tests
+domain=https://jdi-testing.github.io/jdi-light
 timeout_wait_element=5
 timeout_wait_pageLoad=5
 drivers_folder=.\

requirements.txt

@@ -1,3 +1,4 @@
-pywin32==302
-selenium==3.141.0
-requests==2.25.1
+selenium==4.18.1
+requests==2.31.0
+pytest==8.1.1
+webdriver_manager==4.0.1

tests/jdi_uitests_webtests/main/entities/user.py

@@ -7,8 +7,5 @@ def default():
         return User()
 
     def __init__(self):
-        self.login = "epam"
-        self.password = os.getenv("TEST_PASSWORD")
-        self.name = "Name"
-        self.last_name = "Last Name"
-        self.description = "Description"
+        self.login = "Roman"
+        self.password = "Jdi1234"

tests/jdi_uitests_webtests/main/enums/preconditions.py

@@ -6,13 +6,13 @@
 from JDI.web.selenium.preconditions.web_preconditions import WebPreconditions
 
 
-class Preconditions(Enum):
-    HOME_PAGE = ("/index.htm",)
-    CONTACT_PAGE = ("/page1.htm",)
-    METALS_AND_COLORS_PAGE = ("/page2.htm",)
-    SUPPORT_PAGE = ("/page3.htm",)
-    DATES_PAGE = "/page4.htm"
-    SIMPLE_TABLE_PAGE = "/page6.htm"
+class Preconditions(str, Enum):
+    HOME_PAGE = ("/index.html",)
+    CONTACT_PAGE = ("/contacts.html",)
+    METALS_AND_COLORS_PAGE = ("/metals-colors.html",)
+    SUPPORT_PAGE = ("/support.html",)
+    DATES_PAGE = "/dates.html"
+    SIMPLE_TABLE_PAGE = "/simple-table.html"
 
     def is_in_state(self):
         str_value = self.value[0] if isinstance(self.value, tuple) else self.value

tests/jdi_uitests_webtests/main/page_objects/epam_jdi_site.py

@@ -1,6 +1,7 @@
 from JDI.web.selenium.elements.api_interact.find_element_by import By
 from JDI.web.selenium.elements.complex.text_list import TextList
 from JDI.web.selenium.elements.composite.web_site import WebSite
+from tests.jdi_uitests_webtests.main.enums.preconditions import Preconditions
 from tests.jdi_uitests_webtests.main.page_objects.pages import (
     ContactFormPage,
     DatesPage,
@@ -16,12 +17,15 @@
 
 class EpamJDISite(WebSite):
     # pages
-    home_page = HomePage(url="/index.htm", title="Index Page")
-    metals_colors_page = MetalColorPage(url="/page2.htm", title="Metal and Colors")
-    contact_form_page = ContactFormPage(url="/page1.htm", title="Contact Form")
-    support_page = SupportPage(url="/page3.htm", title="Support")
-    dates_page = DatesPage(url="/page4.htm", title="Simple Table")
-    simple_table_page = SimpleTablePage(url="/page6.htm", title="Simple Table")
+    home_page = HomePage(url=Preconditions.HOME_PAGE.value, title="Index Page")
+    metals_colors_page = MetalColorPage(url=Preconditions.METALS_AND_COLORS_PAGE.value,
+                                        title="Metal and Colors")
+    contact_form_page = ContactFormPage(url=Preconditions.CONTACT_PAGE.value,
+                                        title="Contact Form")
+    support_page = SupportPage(url=Preconditions.SUPPORT_PAGE.value, title="Support")
+    dates_page = DatesPage(url=Preconditions.DATES_PAGE.value, title="Simple Table")
+    simple_table_page = SimpleTablePage(url=Preconditions.SIMPLE_TABLE_PAGE.value,
+                                        title="Simple Table")
 
     # elements
     actions_log = TextList(By.css(".logs li"))

tests/jdi_uitests_webtests/main/page_objects/pages/login.py

@@ -7,9 +7,9 @@
 
 class Login(Form):
 
-    login = TextField(By.id("Login"))
+    login = TextField(By.id("name"))
 
-    password = TextField(By.id("Password"))
+    password = TextField(By.id("password"))
 
     button = Button(By.css(".btn-login"))