From 6eaf610d7253a3d28611fc80cc05f3156824ffa5 Mon Sep 17 00:00:00 2001 From: Nir Tal Date: Fri, 9 May 2025 11:21:56 +0300 Subject: [PATCH] re order --- pyproject.toml | 23 +--------------------- {enums => src/enums}/User.py | 0 {enums => src/enums}/__init__.py | 0 {pages => src/pages}/__init__.py | 0 {pages => src/pages}/login_page.py | 2 +- {utilities => src/utilities}/__init__.py | 0 {utilities => src/utilities}/axe_helper.py | 0 {utilities => src/utilities}/constants.py | 0 tests/accesability_test.py | 4 ++-- tests/checkout_test.py | 4 ++-- tests/conftest.py | 4 ++-- tests/inventory_test.py | 4 ++-- tests/login_test.py | 8 ++++---- 13 files changed, 14 insertions(+), 35 deletions(-) rename {enums => src/enums}/User.py (100%) rename {enums => src/enums}/__init__.py (100%) rename {pages => src/pages}/__init__.py (100%) rename {pages => src/pages}/login_page.py (97%) rename {utilities => src/utilities}/__init__.py (100%) rename {utilities => src/utilities}/axe_helper.py (100%) rename {utilities => src/utilities}/constants.py (100%) diff --git a/pyproject.toml b/pyproject.toml index c673e0f21..b3ebd878d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,3 @@ -[build-system] -build-backend = "hatchling.build" -requires = ["hatchling"] - [dependency-groups] dev = [ "ruff==0.11.8", @@ -9,7 +5,6 @@ dev = [ ] [project] -authors = [{name = "nirtal85", email = "nirt236@gmail.com"}] dependencies = [ "allure-pytest==2.14.1", "axe-playwright-python==0.1.4", @@ -21,28 +16,12 @@ dependencies = [ "requests==2.32.3" ] description = "Playwright Python example project with pytest and Allure report" -keywords = [ - "playwright", - "automation", - "testing", - "web" -] name = "playwright-python" -readme = "README.md" requires-python = "~=3.11" version = "0.1.0" -[tool.hatch.build.targets.sdist] -include = ["playwright_python"] - -[tool.hatch.build.targets.wheel] -include = ["playwright_python"] - -[tool.isort] -profile = "black" -skip = ["env", "venv"] - [tool.pytest.ini_options] +pythonpath = ["src"] addopts = [ "--clean-alluredir", "--alluredir=allure-results", diff --git a/enums/User.py b/src/enums/User.py similarity index 100% rename from enums/User.py rename to src/enums/User.py diff --git a/enums/__init__.py b/src/enums/__init__.py similarity index 100% rename from enums/__init__.py rename to src/enums/__init__.py diff --git a/pages/__init__.py b/src/pages/__init__.py similarity index 100% rename from pages/__init__.py rename to src/pages/__init__.py diff --git a/pages/login_page.py b/src/pages/login_page.py similarity index 97% rename from pages/login_page.py rename to src/pages/login_page.py index 4511019b0..f3ae02ae7 100644 --- a/pages/login_page.py +++ b/src/pages/login_page.py @@ -4,7 +4,7 @@ import allure from playwright.sync_api import Page -from enums import User +from src.enums import User @allure.severity(allure.severity_level.CRITICAL) diff --git a/utilities/__init__.py b/src/utilities/__init__.py similarity index 100% rename from utilities/__init__.py rename to src/utilities/__init__.py diff --git a/utilities/axe_helper.py b/src/utilities/axe_helper.py similarity index 100% rename from utilities/axe_helper.py rename to src/utilities/axe_helper.py diff --git a/utilities/constants.py b/src/utilities/constants.py similarity index 100% rename from utilities/constants.py rename to src/utilities/constants.py diff --git a/tests/accesability_test.py b/tests/accesability_test.py index caff9a6ee..28ceb8007 100644 --- a/tests/accesability_test.py +++ b/tests/accesability_test.py @@ -3,11 +3,11 @@ class TestAccessibility: @allure.title("Test Accessibility with Default Counts") - def test_accessibility_default_counts(self, axe_playwright, page): + def test_accessibility_default_counts(self, axe_playwright, page) -> None: axe_playwright.check_accessibility(page) @allure.title("Test Accessibility with Custom Counts") - def test_accessibility_custom_counts(self, axe_playwright, page): + def test_accessibility_custom_counts(self, axe_playwright, page) -> None: axe_playwright.check_accessibility( page, maximum_allowed_violations_by_impact={ diff --git a/tests/checkout_test.py b/tests/checkout_test.py index 1b4de9b83..36b5bebd1 100644 --- a/tests/checkout_test.py +++ b/tests/checkout_test.py @@ -1,12 +1,12 @@ import pytest from playwright.sync_api import Page, expect -from enums.User import User +from src.enums.User import User class TestCheckout: @pytest.mark.parametrize("browser_context_args", [User.STANDARD_USER], indirect=True) - def test_checkout_counter(self, browser_context_args, page: Page): + def test_checkout_counter(self, browser_context_args, page: Page) -> None: page.evaluate("localStorage.setItem('cart-contents', '[4,0]');") page.reload() expect(page.get_by_test_id("shopping-cart-badge")).to_have_text("2") diff --git a/tests/conftest.py b/tests/conftest.py index 023d46c1f..53cf46c7c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,8 +6,8 @@ from axe_playwright_python.sync_playwright import Axe from playwright.sync_api import Page, Playwright -from utilities.axe_helper import AxeHelper -from utilities.constants import Constants +from src.utilities.axe_helper import AxeHelper +from src.utilities.constants import Constants @pytest.fixture(scope="function", autouse=True) diff --git a/tests/inventory_test.py b/tests/inventory_test.py index 71240e480..3a18cb43f 100644 --- a/tests/inventory_test.py +++ b/tests/inventory_test.py @@ -1,10 +1,10 @@ import pytest from playwright.sync_api import Page, expect -from enums.User import User +from src.enums.User import User class TestInventory: @pytest.mark.parametrize("browser_context_args", [User.STANDARD_USER], indirect=True) - def test_inventory_page(self, browser_context_args, page: Page): + def test_inventory_page(self, browser_context_args, page: Page) -> None: expect(page.get_by_test_id("title")).to_have_text("Products") diff --git a/tests/login_test.py b/tests/login_test.py index 683729279..00b0e3ad0 100644 --- a/tests/login_test.py +++ b/tests/login_test.py @@ -2,8 +2,8 @@ import pytest from playwright.sync_api import Page, expect -from enums.User import User -from pages.login_page import LoginPage +from src.enums.User import User +from src.pages.login_page import LoginPage class TestLogin: @@ -13,7 +13,7 @@ def setup(self, page: Page): @pytest.mark.devRun @allure.title("Login with valid credentials test") - def test_valid_login(self, base_url, page: Page): + def test_valid_login(self, base_url, page: Page) -> None: self.login_page.login(User.STANDARD_USER, "secret_sauce") expect(page).to_have_url(f"{base_url}inventory.html") @@ -34,6 +34,6 @@ def test_valid_login(self, base_url, page: Page): ids=["invalid_password", "locked_user"], ) @allure.title("Login with invalid credentials test") - def test_login_error(self, page: Page, username: str, password: str, expected_error: str): + def test_login_error(self, page: Page, username: str, password: str, expected_error: str) -> None: self.login_page.login(username, password) expect(self.login_page.error_message).to_have_text(expected_error)