diff --git a/components_derived/container_system_log_events.py b/components_derived/container_system_log_events.py index d654dc2..34f977c 100644 --- a/components_derived/container_system_log_events.py +++ b/components_derived/container_system_log_events.py @@ -67,13 +67,13 @@ class SystemLogEventsContainer(EventsContainerComponent): sidebar_filter.check_content() filter_type_bar = sidebar_filter.get_filtering_parameter("filter_type") - filter_type_title = filter_type_bar.get_filter_parameter_title() + filter_type_title = filter_type_bar.get_selection_bar_title() assert filter_type_title == "Тип", "Filtering parameter bar 'Тип' is missing" filter_strictness_bar = sidebar_filter.get_filtering_parameter("filter_strictness") - filter_strictness_title = filter_strictness_bar.get_filter_parameter_title() + filter_strictness_title = filter_strictness_bar.get_selection_bar_title() assert filter_strictness_title == "Строгость", "Filtering parameter bar 'Строгость' is missing" filter_host_bar = sidebar_filter.get_filtering_parameter("filter_host") - filter_host_title = filter_host_bar.get_filter_parameter_title() + filter_host_title = filter_host_bar.get_selection_bar_title() assert filter_host_title == "Хост", "Filtering parameter bar 'Хост' is missing" diff --git a/tests/e2e/test_system_log_events_container.py b/tests/e2e/test_system_log_events_container.py index 9a3c653..de6da92 100644 --- a/tests/e2e/test_system_log_events_container.py +++ b/tests/e2e/test_system_log_events_container.py @@ -4,7 +4,7 @@ контейнера для отображения событий системного журнала. """ -# import pytest +import pytest from playwright.sync_api import Page from pages.main_page import MainPage from pages.login_page import LoginPage @@ -154,7 +154,7 @@ class TestSystemLogEventsContainer: 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, - convert2timestamp=True) + convert2timestamp=True) assert not is_descending_order, "Column data should be in ascending order" system_log_events_container.click_event_table_header_arrow(index) @@ -162,7 +162,7 @@ class TestSystemLogEventsContainer: 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, - convert2timestamp=True) + convert2timestamp=True) assert is_descending_order, "Column data should be in descending order" # @pytest.mark.develop @@ -237,7 +237,8 @@ class TestSystemLogEventsContainer: system_log_events_container.should_be_final_state() current_number = system_log_events_container.get_current_data_set_number() - assert current_number == last_number, f"Expected page number {last_number} is not equal actual {current_number}" + assert current_number == last_number, \ + f"Expected page number {last_number} is not equal actual {current_number}" # Переход на первую страницу, переход на следующую страницу, возврат на первую страницу system_log_events_container.click_first_page() @@ -272,15 +273,18 @@ class TestSystemLogEventsContainer: # to_do: проверка, что происходит обновление содержимого таблицы counter = 1 - while counter <= tested_pages: + while counter < tested_pages: system_log_events_container.click_chevron_right() + counter += 1 browser.wait_for_timeout(2000) - system_log_events_container.should_be_all_enabled() - - counter += 1 + if counter == tested_pages: + system_log_events_container.should_be_final_state() + else: + system_log_events_container.should_be_all_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}" + assert current_number == counter,\ + f"Expected page number {counter} is not equal actual {current_number}" # загрузка страниц от конца к началу # to_do: проверка, что происходит обновление содержимого таблицы @@ -292,7 +296,8 @@ class TestSystemLogEventsContainer: counter -= 1 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}" + assert current_number == counter,\ + f"Expected page number {counter} is not equal actual {current_number}" # Проверка возврата к начальному состоянию system_log_events_container.click_chevron_left()