From 65617b2598a7f7864870cda367782e433c3b58ba Mon Sep 17 00:00:00 2001 From: Zarina Date: Wed, 15 Jan 2025 22:00:58 -0500 Subject: [PATCH 1/2] Your descriptive commit message --- components/my_teachers.py | 2 +- tests/test_btn_my_teachers.py | 7 ++----- tests/test_header.py | 30 +++++------------------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/components/my_teachers.py b/components/my_teachers.py index 6f50af2d..16f28d6b 100644 --- a/components/my_teachers.py +++ b/components/my_teachers.py @@ -41,6 +41,6 @@ def check_teachers_list(self) -> object: else: # Если репетиторов нет, проверяем сообщение no_teachers_message = self.page.locator( - 'text="У вас пока нет Репетиторов. Попросите репетитора отправить вам приглашение."' + 'text="Пока у вас нет репетиторов."' ) expect(no_teachers_message).to_be_visible() diff --git a/tests/test_btn_my_teachers.py b/tests/test_btn_my_teachers.py index ef56d45e..41cac0a2 100644 --- a/tests/test_btn_my_teachers.py +++ b/tests/test_btn_my_teachers.py @@ -1,4 +1,3 @@ -import pytest from playwright.sync_api import Page from components.my_teachers import MyTeachersPage @@ -22,12 +21,10 @@ def test_my_teachers_btn_click(header, login, page: Page): my_teachers_button.verify_page_my_teachers_opened() -@pytest.mark.skip(reason="не прошёл CI после изменений 26.12.2024") -def test_check_teachers_list(header, register, page: Page): +def test_check_teachers_list(header, login, page: Page): """Проверка что открылась страница 'Мои репетиторы' со списком репетиторов или без с соответствующим сообщением.""" header.visit() - header.click_registration_button() - register.registration_new_user("student") + login.full_login("student849727@gmail.com", "xaD1n0tUfaHN") my_teachers_button = MyTeachersPage(page) my_teachers_button.click_my_teachers_btn() my_teachers_button.check_teachers_list() diff --git a/tests/test_header.py b/tests/test_header.py index 1fc63a0d..7b3dbe81 100644 --- a/tests/test_header.py +++ b/tests/test_header.py @@ -100,21 +100,6 @@ def test_login_button_is_enabled(header): header.login_button_is_enabled() -# TC_11.007.001|Header - Teacher> Check the "Статистика" button -def test_statistics_button_is_visible(header, login): - header.visit() - login.full_login("zayatest55@gmail.com", "RM7tAgSYSh7X") - header.statistics_button_is_visible() - - -# TC_11.007.001|Header - Teacher> Check the "Статистика" button -@pytest.mark.skip(reason="Тест временно отключен после обновления 09.01.2025") -def test_verify_redirection_on_statistics_page(header, login): - header.visit() - login.full_login("zayatest55@gmail.com", "RM7tAgSYSh7X") - header.click_statistics_button() - - # TC_11.004.001.001 | Header - Teacher > "Выйти" - button is not available when user don't logined def test_header_logout_is_absent(header): """ @@ -131,25 +116,20 @@ def test_my_students_btn_is_not_visible_for_guests(header, homepage): # TC_11.006.005 [Teacher] Header > My students(button) > "Мои студенты" button is not available for students -@pytest.mark.skip(reason="Тест временно отключен после обновления 09.01.2025") -def test_my_students_btn_is_not_visible_for_students(register, header, homepage): +def test_my_students_btn_is_not_visible_for_students(login, header): header.visit() - header.click_registration_button() - register.registration_new_user(user_type="student") + login.full_login("acc.python.test@gmail.com", "jUvJ5ZSxzdIr") assert header.my_students_button_is_hidden() is True # TC_11.006.004 [Teacher] Header > My students(button) > # "Мои студенты" button is not available when no announcement is created -@pytest.mark.skip(reason="Тест временно отключен после обновления 09.01.2025") -def test_my_students_btn_is_not_visible_for_teacher_with_no_announcement( - register, header, homepage -): +def test_my_students_btn_is_not_visible_for_teacher_with_no_announcement(login, header): header.visit() - header.click_registration_button() - register.registration_new_user(user_type="tutor") + login.full_login("zayatest55@gmail.com", "RM7tAgSYSh7X") assert header.my_students_button_is_hidden() is True + @pytest.mark.skip(reason="Тест временно отключен после обновления 09.01.2025") def test_filter_tutor_by_category(header, find_tutor): header.visit() From c38c15bc96ae666fcde776a3676f7022e81ac5c3 Mon Sep 17 00:00:00 2001 From: Zarina Date: Wed, 15 Jan 2025 22:04:55 -0500 Subject: [PATCH 2/2] RF < fixed test_check_teachers_list test_my_students_btn_is_not_visible_for_teacher_with_no_announcement test_my_students_btn_is_not_visible_for_students --- components/my_teachers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/my_teachers.py b/components/my_teachers.py index 16f28d6b..b6d2220b 100644 --- a/components/my_teachers.py +++ b/components/my_teachers.py @@ -21,7 +21,7 @@ def verify_page_my_teachers_opened(self): title = self.page.get_by_title("Объявления") assert "Объявления", title - @allure.step("Проверяем, что список репетиторов отображается или нет") + @allure.step("Проверяем, что список репетиторов отображается или нет ") def check_teachers_list(self) -> object: # Проверяем, есть ли элементы репетиторов на странице teachers_list = self.page.locator(".card-body")