From 1dcfa548da333dcfc991085fc08b00e4e11bb258 Mon Sep 17 00:00:00 2001 From: RadislavY Date: Thu, 9 Oct 2025 08:16:01 +0300 Subject: [PATCH] revert 93e3d87d9e3d71193e336b78b1f918a206b559c8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert Рефакторинг тестов системного журнала --- tests/e2e/test_system_log_events_container.py | 97 ++++++------------- 1 file changed, 32 insertions(+), 65 deletions(-) diff --git a/tests/e2e/test_system_log_events_container.py b/tests/e2e/test_system_log_events_container.py index 9b5d719..f5f5dca 100644 --- a/tests/e2e/test_system_log_events_container.py +++ b/tests/e2e/test_system_log_events_container.py @@ -8,9 +8,6 @@ import pytest from playwright.sync_api import Page from pages.main_page import MainPage from pages.login_page import LoginPage -from tools.logger import get_logger - -logger = get_logger("TEST_SYSTEM_LOG_EVENTS_CONTAINER") # @pytest.mark.smoke @@ -147,32 +144,23 @@ class TestSystemLogEventsContainer: system_log_events_container = mp.click_events_panel_system_log_tab() index = 1 - # Получаем начальное состояние сортировки - initial_state = system_log_events_container.get_arrow_button_state(index) + state = system_log_events_container.get_arrow_button_state(index) + assert state == "down", "Arrow button should be down" - # Кликаем для изменения сортировки system_log_events_container.click_event_table_header_arrow(index) - browser.wait_for_timeout(500) + browser.wait_for_timeout(300) - new_state = system_log_events_container.get_arrow_button_state(index) + state = system_log_events_container.get_arrow_button_state(index) + assert state == "up", "Arrow button should be up" + is_descending_order = system_log_events_container.check_events_table_column_descending_order(index) + assert not is_descending_order, "Column data should be in ascending order" - # Проверяем что состояние изменилось - assert new_state != initial_state, "Arrow button state should change after click" - - # Проверяем порядок данных в зависимости от состояния - if new_state == "up": - is_descending_order = system_log_events_container.check_events_table_column_descending_order(index) - assert not is_descending_order, "Column data should be in ascending order when arrow is up" - else: - is_descending_order = system_log_events_container.check_events_table_column_descending_order(index) - assert is_descending_order, "Column data should be in descending order when arrow is down" - - # Возвращаем обратно и проверяем system_log_events_container.click_event_table_header_arrow(index) - browser.wait_for_timeout(500) - - final_state = system_log_events_container.get_arrow_button_state(index) - assert final_state == initial_state, "Arrow button should return to initial state after second click" + browser.wait_for_timeout(300) + state = system_log_events_container.get_arrow_button_state(index) + assert state == "down", "Arrow button should be down" + is_descending_order = system_log_events_container.check_events_table_column_descending_order(index) + assert is_descending_order, "Column data should be in descending order" @pytest.mark.develop def test_events_table_pagination(self, browser: Page): @@ -202,62 +190,41 @@ class TestSystemLogEventsContainer: current_number = system_log_events_container.get_current_data_set_number() assert current_number == 1, "The first page should be number one" - # Запоминаем начальный номер страницы - previous_page = current_number - pages_visited = [current_number] - - # Переход вперед по страницам - max_pages = 200 # Защита от бесконечного цикла - page_count = 0 - - while not is_chevron_right_disabled and page_count < max_pages: + # загрузка страниц от начала и до конца + # to_do: проверка, что происходит обновление содержимого таблицы + counter = 1 + while not is_chevron_right_disabled: system_log_events_container.click_chevron_right() - browser.wait_for_timeout(300) # Даем время на загрузку - - current_number = system_log_events_container.get_current_data_set_number() - - # Проверяем что мы перешли на новую страницу (номер изменился) - assert current_number != previous_page, f"Page number should change after clicking next. Was {previous_page}, still {current_number}" - - # Проверяем что мы не возвращаемся на уже посещенную страницу - assert current_number not in pages_visited, f"Page {current_number} was already visited. Pages visited: {pages_visited}" - - pages_visited.append(current_number) - previous_page = current_number - page_count += 1 + counter += 1 is_chevron_left_disabled = system_log_events_container.is_chevron_left_disabled() - assert not is_chevron_left_disabled, "Arrow Left button should be enabled after moving forward" + assert not is_chevron_left_disabled, "Arrow Left button should be enabled" is_chevron_right_disabled = system_log_events_container.is_chevron_right_disabled() - logger.info(f"Visited {len(pages_visited)} pages: {pages_visited}") + current_number = system_log_events_container.get_current_data_set_number() + assert current_number == counter, f"Expected page number {counter} is not equal actual {current_number}" - # Переход назад по страницам + # загрузка страниц от конца к началу + # to_do: проверка, что происходит обновление содержимого таблицы while not is_chevron_left_disabled: system_log_events_container.click_chevron_left() - browser.wait_for_timeout(300) # Даем время на загрузку - - current_number = system_log_events_container.get_current_data_set_number() - - # Проверяем что мы перешли на предыдущую страницу - # (должны идти в обратном порядке от последней к первой) - expected_previous_page = pages_visited[-2] if len(pages_visited) > 1 else 1 - assert current_number == expected_previous_page, f"Expected page {expected_previous_page} when going back, but got {current_number}. Pages visited: {pages_visited}" - - # Удаляем последнюю страницу из списка (движемся назад) - pages_visited.pop() + counter -= 1 is_chevron_left_disabled = system_log_events_container.is_chevron_left_disabled() + is_chevron_right_disabled = system_log_events_container.is_chevron_right_disabled() - assert not is_chevron_right_disabled, "Arrow Right button should be enabled when going back" + assert not is_chevron_right_disabled, "Arrow Right button should be enabled" + + current_number = system_log_events_container.get_current_data_set_number() + assert current_number == counter, f"Expected page number {counter} is not equal actual {current_number}" # Проверка возврата к начальному состоянию is_chevron_left_disabled = system_log_events_container.is_chevron_left_disabled() - assert is_chevron_left_disabled, "Arrow Left button should be disabled at the first page" + assert is_chevron_left_disabled, "Arrow Left button should be disabled" is_chevron_right_disabled = system_log_events_container.is_chevron_right_disabled() - assert not is_chevron_right_disabled, "Arrow Right button should be enabled at the first page" + assert not is_chevron_right_disabled, "Arrow Right button should be enabled" - final_number = system_log_events_container.get_current_data_set_number() - assert final_number == 1, f"Should return to first page (1), but got {final_number}" + current_number = system_log_events_container.get_current_data_set_number() + assert current_number == 1, "The first page should be number one"