Merge remote-tracking branch 'origin/main'

nirtal85 · Jan 30, 2024 · b939c5d · b939c5d
2 parents 2c12fa3 + 92fa683
commit b939c5d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/devRun.yml b/.github/workflows/devRun.yml
@@ -83,3 +83,8 @@ jobs:
           PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: allure-history
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-traces
+          path: test-results/
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -79,3 +79,8 @@ jobs:
           PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: allure-history
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-traces
+          path: test-results/
diff --git a/pages/login_page.py b/pages/login_page.py
@@ -20,7 +20,3 @@ def login(self, username, password):
         self.user_name_field.type(username)
         self.password_field.type(password)
         self.login_button.click()
-
-    @allure.step("Get error message")
-    def get_error_message_text(self):
-        return self.error_message.text_content()
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,8 +25,10 @@ addopts = [
     "--alluredir=allure-results",
     "-ra",
     "--color=yes",
+    "--browser-channel=chrome",
     "--headed",
     "--video=retain-on-failure",
+    "--tracing=retain-on-failure"
 ]
 
 [tool.poetry.dependencies]

diff --git a/tests/test_login.py b/tests/test_login.py
@@ -1,5 +1,5 @@
 import pytest
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 
 from pages.login_page import LoginPage
 
@@ -18,21 +18,13 @@ def setup(self, page: Page):
 
     def test_valid_login(self, page: Page):
         self.login_page.login("standard_user", "secret_sauce")
-        assert (
-            page.url == ex_url
-        ), f"Expected url to be {ex_url} after a valid login, but got {page.url} instead"
+        expect(page).to_have_url(ex_url)
 
     def test_invalid_login(self, page: Page):
         self.login_page.login("standard_user", "secret_sauce1")
-        assert self.login_page.get_error_message_text() == ex_error_message, (
-            f"Expected invalid login error message to be {ex_error_message},"
-            f" but got {self.login_page.get_error_message_text()} instead "
-        )
+        expect(self.login_page.error_message).to_have_text(ex_error_message)
 
     @pytest.mark.devRun
     def test_locked_out_user(self, page: Page):
         self.login_page.login("locked_out_user", "secret_sauce")
-        assert self.login_page.get_error_message_text() == ex_locked_out_user_message, (
-            f"Expected locked out user message to be {ex_locked_out_user_message}, "
-            f"but got {self.login_page.get_error_message_text()} instead"
-        )
+        expect(self.login_page.error_message).to_have_text(ex_locked_out_user_message)