Skip to content

Commit f9e355b

Browse files
authored
Merge pull request #12 from startrug/SPF-04
Spf-04: feat: Reorganize tests; add sample test for alternative website
2 parents ca3ac15 + 06b38c5 commit f9e355b

24 files changed

+262
-69
lines changed

.gitignore

Lines changed: 148 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,148 @@
1-
.idea
2-
venv
3-
reports
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py,cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
98+
__pypackages__/
99+
100+
# Celery stuff
101+
celerybeat-schedule
102+
celerybeat.pid
103+
104+
# SageMath parsed files
105+
*.sage.py
106+
107+
# Environments
108+
.env
109+
.venv
110+
env/
111+
venv/
112+
ENV/
113+
env.bak/
114+
venv.bak/
115+
116+
# Spyder project settings
117+
.spyderproject
118+
.spyproject
119+
120+
# Rope project settings
121+
.ropeproject
122+
123+
# mkdocs documentation
124+
/site
125+
126+
# mypy
127+
.mypy_cache/
128+
.dmypy.json
129+
dmypy.json
130+
131+
# Pyre type checker
132+
.pyre/
133+
134+
# pytype static type analyzer
135+
.pytype/
136+
137+
# Cython debug symbols
138+
cython_debug/
139+
140+
# PyCharm
141+
# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
142+
# be found at https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
143+
# and can be added to the global gitignore or merged into this file. For a more nuclear
144+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
145+
.idea/
146+
147+
# VSCode
148+
.vscode
File renamed without changes.

base/page_base.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import allure
2+
3+
4+
class PageBase:
5+
def __init__(self, driver):
6+
self.driver = driver
7+
8+
@allure.step("Opening main page")
9+
def open(self):
10+
self.driver.open()

config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"browser": "firefox",
3-
"headless_mode": true,
4-
"tested_page": "http://www.phptravels.net/",
2+
"browser": "chrome",
3+
"headless_mode": false,
4+
"base_url": "http://www.demoblaze.com/",
55
"timeout": 10
66
}

extensions/webdriver_extended.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from selenium.webdriver.support.event_firing_webdriver import EventFiringWebDriver
2+
3+
4+
class WebDriverExtended(EventFiringWebDriver):
5+
def __init__(self, driver, event_listener, config):
6+
super().__init__(driver, event_listener)
7+
self.base_url = config["base_url"]
8+
9+
def open(self):
10+
self.get(self.base_url)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
import datetime
33
from selenium.webdriver.support.events import AbstractEventListener
44

5-
log_filename = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
6-
logging.basicConfig(
7-
# log file will be created in "tests" directory. Feel free to change the path or filename
8-
filename=f"{log_filename}.log",
9-
format="%(asctime)s: %(levelname)s: %(message)s",
10-
level=logging.INFO
11-
)
12-
135

146
class WebDriverListener(AbstractEventListener):
7+
log_filename = datetime.datetime.now().strftime("%Y%m%d")
8+
logging.basicConfig(
9+
# log file will be created in "tests" directory. Feel free to change the path or filename
10+
filename=f"{log_filename}.log",
11+
format="%(asctime)s: %(levelname)s: %(message)s",
12+
level=logging.INFO
13+
)
14+
1515
def __init__(self):
1616
self.logger = logging.getLogger("selenium")
1717

1818
def before_navigate_to(self, url, driver):
1919
self.logger.info(f"Navigating to {url}")
2020

2121
def after_navigate_to(self, url, driver):
22-
self.logger.info(f"Navigated to {url}")
22+
self.logger.info(f"{url} opened")
2323

2424
def before_find(self, by, value, driver):
2525
self.logger.info(f"Searching for element by {by} {value}")

pages/base_page.py

Lines changed: 0 additions & 6 deletions
This file was deleted.

pages/demoblaze/__init__.py

Whitespace-only changes.

pages/demoblaze/home_page.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
from base.page_base import PageBase
2+
import allure
3+
4+
5+
class HomePage(PageBase):
6+
def __init__(self, driver):
7+
super().__init__(driver)
8+
9+
@allure.step("Getting title of the page")
10+
def get_page_title(self):
11+
return self.driver.title

pages/phptravels/__init__.py

Whitespace-only changes.

pages/login_page.py renamed to pages/phptravels/login_page.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import allure
22
from selenium.webdriver.common.keys import Keys
33
from locators.locators import LogInLocators
4-
from pages.base_page import BasePage
4+
from base.page_base import PageBase
55

66

7-
class LogInPage(BasePage):
7+
class LogInPage(PageBase):
88
def __init__(self, driver):
99
super().__init__(driver)
1010

@@ -21,7 +21,8 @@ def set_user_inputs(self, email, password):
2121
self.driver.find_element(*LogInLocators.email_input).click()
2222
self.driver.find_element(*LogInLocators.email_input).send_keys(email)
2323
self.driver.find_element(*LogInLocators.password_input).click()
24-
self.driver.find_element(*LogInLocators.password_input).send_keys(password, Keys.ENTER)
24+
self.driver.find_element(
25+
*LogInLocators.password_input).send_keys(password, Keys.ENTER)
2526

2627
@allure.step("Logout")
2728
def logout(self):
File renamed without changes.
File renamed without changes.

tests/demoblaze_tests/__init__.py

Whitespace-only changes.

tests/conftest.py renamed to tests/demoblaze_tests/conftest.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
from utils.driver_factory import DriverFactory
88

9-
CONFIG_PATH = "../config.json"
9+
CONFIG_PATH = "config.json"
1010
DEFAULT_WAIT_TIME = 10
1111
SUPPORTED_BROWSERS = ["chrome", "firefox", "edge"]
12-
DEFAULT_WEBSITE = "http://www.google.com/"
12+
DEFAULT_URL = "http://www.demoblaze.com/"
1313

1414

1515
@pytest.fixture(scope='session')
@@ -33,19 +33,20 @@ def wait_time_setup(config):
3333

3434

3535
@pytest.fixture(scope='session')
36-
def website_setup(config):
37-
return config['tested_page'] if 'tested_page' in config else DEFAULT_WEBSITE
36+
def url_setup(config):
37+
return config["base_url"] if "base_url" in config else DEFAULT_URL
3838

3939

4040
@pytest.fixture()
4141
def setup(request, config):
42-
driver = DriverFactory.get_driver(config["browser"], config["headless_mode"])
42+
driver = DriverFactory.get_driver(config)
4343
driver.implicitly_wait(config["timeout"])
4444
request.cls.driver = driver
4545
before_failed = request.session.testsfailed
4646
if config["browser"] == "firefox":
4747
driver.maximize_window()
4848
yield
4949
if request.session.testsfailed != before_failed:
50-
allure.attach(driver.get_screenshot_as_png(), name="Test failed", attachment_type=AttachmentType.PNG)
50+
allure.attach(driver.get_screenshot_as_png(),
51+
name="Test failed", attachment_type=AttachmentType.PNG)
5152
driver.quit()
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import pytest
2+
import allure
3+
4+
from pages.demoblaze.home_page import HomePage
5+
6+
7+
@pytest.mark.usefixtures("setup")
8+
class TestHomePage:
9+
@allure.title("Home page - smoke test")
10+
@allure.description("Check if home page of Demoblaze has correct title")
11+
def test_homepage_title(self):
12+
homepage = HomePage(self.driver)
13+
homepage.open()
14+
assert("STORE" in homepage.get_page_title())
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
import pytest
22
import allure
33
from locators.locators import UserAccountLocators, LogInLocators
4-
from pages.login_page import LogInPage
4+
from pages.phptravels.login_page import LogInPage
55

66

7-
@pytest.mark.usefixtures("setup", "website_setup")
7+
@pytest.mark.usefixtures("setup")
88
class TestLogIn:
99

1010
@allure.title("Login with valid data test")
1111
@allure.description("This is test of login with valid data")
12-
def test_login_passed(self, config):
12+
def test_login_passed(self):
1313
log_in_page = LogInPage(self.driver)
14-
log_in_page.open_home_page(config)
14+
log_in_page.open()
1515
log_in_page.expand_account_menu()
1616
log_in_page.open_login_page()
1717
log_in_page.set_user_inputs("[email protected]", "demouser")
1818
welcome_msg = "Hi, Demo User"
19-
assert welcome_msg in self.driver.find_element(*UserAccountLocators.welcome_msg).text
19+
assert welcome_msg in self.driver.find_element(
20+
*UserAccountLocators.welcome_msg).text
2021
log_in_page.expand_account_menu()
2122
log_in_page.logout()
2223

2324
@allure.title("Login with invalid email test")
2425
@allure.description("This is test of login with invalid email")
25-
def test_login_failed(self, config):
26+
def test_login_failed(self):
2627
log_in_page = LogInPage(self.driver)
27-
log_in_page.open_home_page(config)
28+
log_in_page.open()
2829
log_in_page.expand_account_menu()
2930
log_in_page.open_login_page()
3031
log_in_page.set_user_inputs("[email protected]", "demouser")
3132
error_msg = "Invalid Email or Password"
32-
assert error_msg in self.driver.find_element(*LogInLocators.invalid_data_msg).text
33-
34-
33+
assert error_msg in self.driver.find_element(
34+
*LogInLocators.invalid_data_msg).text

0 commit comments

Comments
 (0)