maintenance: update gitignore, reorganize tests

Author: startrug

.gitignore

@@ -1,3 +1,148 @@
-.idea
-venv
-reports
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# VSCode
+.vscode

config.json

@@ -1,6 +1,6 @@
 {
   "browser": "chrome",
   "headless_mode": false,
-  "base_url": "http://www.phptravels.net/",
+  "base_url": "http://www.demoblaze.com/",
   "timeout": 10
 }

helpers/web_driver_listener.py renamed to helpers/webdriver_listener.py

@@ -3,4 +3,4 @@ def __init__(self, driver):
         self.driver = driver
 
     def open(self):
-        self.driver.open()
+        self.driver.open()

pages/base_page.py

@@ -21,7 +21,7 @@ requests==2.22.0
 selenium==3.141.0
 six==1.13.0
 toml==0.10.2
-urllib3==1.25.6
+urllib3==1.26.4
 wcwidth==0.1.7
 webdriver-manager==3.4.0
 xlrd==1.2.0

requirements.txt

@@ -6,7 +6,7 @@
 
 from utils.driver_factory import DriverFactory
 
-CONFIG_PATH = "../config.json"
+CONFIG_PATH = "config.json"
 DEFAULT_WAIT_TIME = 10
 SUPPORTED_BROWSERS = ["chrome", "firefox", "edge"]
 DEFAULT_URL = "http://www.google.com/"
@@ -47,5 +47,6 @@ def setup(request, config):
         driver.maximize_window()
     yield
     if request.session.testsfailed != before_failed:
-        allure.attach(driver.get_screenshot_as_png(), name="Test failed", attachment_type=AttachmentType.PNG)
+        allure.attach(driver.get_screenshot_as_png(),
+                      name="Test failed", attachment_type=AttachmentType.PNG)
     driver.quit()

tests/conftest.py

@@ -16,7 +16,8 @@ def test_login_passed(self):
         log_in_page.open_login_page()
         log_in_page.set_user_inputs("[email protected]", "demouser")
         welcome_msg = "Hi, Demo User"
-        assert welcome_msg in self.driver.find_element(*UserAccountLocators.welcome_msg).text
+        assert welcome_msg in self.driver.find_element(
+            *UserAccountLocators.welcome_msg).text
         log_in_page.expand_account_menu()
         log_in_page.logout()
 
@@ -29,6 +30,5 @@ def test_login_failed(self,):
         log_in_page.open_login_page()
         log_in_page.set_user_inputs("[email protected]", "demouser")
         error_msg = "Invalid Email or Password"
-        assert error_msg in self.driver.find_element(*LogInLocators.invalid_data_msg).text
-
-
+        assert error_msg in self.driver.find_element(
+            *LogInLocators.invalid_data_msg).text

tests/test_log_in.py renamed to tests/phptravel_tests_deprecated/test_log_in.py

@@ -2,7 +2,7 @@
 from webdriver_manager.chrome import ChromeDriverManager
 from webdriver_manager.firefox import GeckoDriverManager
 from webdriver_manager.microsoft import EdgeChromiumDriverManager
-from helpers.web_driver_listener import WebDriverListener
+from helpers.webdriver_listener import WebDriverListener
 from msedge.selenium_tools import EdgeOptions, Edge
 from extensions.webdriver_extended import WebDriverExtended