diff --git a/test_data/exercises_ru_pages_data.py b/test_data/exercises_ru_pages_data.py index 9acd3420b0..b2477192f7 100644 --- a/test_data/exercises_ru_pages_data.py +++ b/test_data/exercises_ru_pages_data.py @@ -22,12 +22,18 @@ class ExercisesRuPagesData: s = 'background-image: url("https://brnup.s3.eu-north-1.amazonaws.com/pictures/theme/' e = '.svg");' - subgroup_links_style_words_ru = (f"{s}family{e}", f"{s}home{e}", f"{s}food{e}", f"{s}clothes{e}", f"{s}school{e}", - f"{s}math{e}", f"{s}pets{e}", f"{s}animals{e}", f"{s}transport{e}", f"{s}colors{e}", f"{s}city{e}", - f"{s}country{e}", f"{s}walk{e}", f"{s}weather{e}", f"{s}future{e}", f"{s}body{e}", f"{s}game{e}", - f"{s}adventure{e}", f"{s}hospital{e}", f"{s}feelings{e}", f"{s}toys{e}", f"{s}insects{e}", f"{s}interior{e}", - f"{s}kitchen{e}", f"{s}music{e}", f"{s}musical_instruments{e}", f"{s}birds{e}", f"{s}jewelry{e}", - f"{s}history{e}", f"{s}actions{e}", f"{s}audible_actions{e}", f"{s}more_transport{e}", - f"{s}special_transport{e}", f"{s}fruit_trees{e}", f"{s}plants{e}", f"{s}trees{e}", f"{s}sport{e}", - f"{s}shop{e}", f"{s}artiodactyls{e}", f"{s}dogs{e}", f"{s}stationery{e}", f"{s}flowers{e}", f"{s}literature{e}", - f"{s}physics{e}", f"{s}biology{e}", f"{s}instruments{e}") + + subgroup_links_style_similar_phrases_ru = ( + f"{s}longShortPhrases{e}", f"{s}noPhrases{e}", f"{s}similarPhrases{e}", f"{s}differentEndPhrases{e}", + f"{s}shortWords{e}", f"{s}prepositionPhrases{e}") + + subgroup_links_style_words_ru = ( + f"{s}family{e}", f"{s}home{e}", f"{s}food{e}", f"{s}clothes{e}", f"{s}school{e}", f"{s}math{e}", f"{s}pets{e}", + f"{s}animals{e}", f"{s}transport{e}", f"{s}colors{e}", f"{s}city{e}", f"{s}country{e}", f"{s}walk{e}", + f"{s}weather{e}", f"{s}future{e}", f"{s}body{e}", f"{s}game{e}", f"{s}adventure{e}", f"{s}hospital{e}", + f"{s}feelings{e}", f"{s}toys{e}", f"{s}insects{e}", f"{s}interior{e}", f"{s}kitchen{e}", f"{s}music{e}", + f"{s}musical_instruments{e}", f"{s}birds{e}", f"{s}jewelry{e}", f"{s}history{e}", f"{s}actions{e}", + f"{s}audible_actions{e}", f"{s}more_transport{e}", f"{s}special_transport{e}", f"{s}fruit_trees{e}", + f"{s}plants{e}", f"{s}trees{e}", f"{s}sport{e}", f"{s}shop{e}", f"{s}artiodactyls{e}", f"{s}dogs{e}", + f"{s}stationery{e}", f"{s}flowers{e}", f"{s}literature{e}", f"{s}physics{e}", f"{s}biology{e}", + f"{s}instruments{e}") diff --git a/test_data/exercises_ru_similar_phrases_page_data.py b/test_data/exercises_ru_similar_phrases_page_data.py index 9611362623..93a3f96853 100644 --- a/test_data/exercises_ru_similar_phrases_page_data.py +++ b/test_data/exercises_ru_similar_phrases_page_data.py @@ -3,8 +3,6 @@ class ExercisesRuSimilarPhrasesPageData: - # group_link_active_links = ('Слова', 'Слова Королёвой', 'Похожие фразы', 'Группа слов', 'Предложения', - # 'Дихотическое слушание', 'Слова с частотной группировкой') subgroup_links_text = ('Разной длительности', 'С частицей Не', 'Похожие', 'С разным окончанием', 'Из коротких слов', 'С разными предлогами') @@ -13,8 +11,3 @@ class ExercisesRuSimilarPhrasesPageData: ExUrls.URL_EXERCISES_RU_SIMILAR_PHRASES_PAGE) links_status_code = (200,) - - s = 'background-image: url("https://brnup.s3.eu-north-1.amazonaws.com/pictures/theme/' - e = '.svg");' - subgroup_links_style = (f"{s}longShortPhrases{e}", f"{s}noPhrases{e}", f"{s}similarPhrases{e}", - f"{s}differentEndPhrases{e}", f"{s}shortWords{e}", f"{s}prepositionPhrases{e}") diff --git a/tests/exercises_ru_similar_phrases_page_test.py b/tests/exercises_ru_similar_phrases_page_test.py index a2d73b5b7f..6cdd6e2a3b 100644 --- a/tests/exercises_ru_similar_phrases_page_test.py +++ b/tests/exercises_ru_similar_phrases_page_test.py @@ -168,7 +168,7 @@ def test_ersp_04_01_verify_images_attributes(self, driver, exercises_ru_similar_ page = erspPage(driver) links_style = page.get_links_style() assert links_style, "The 'style' attribute value of links is empty" - assert all(element in erspPD.subgroup_links_style for element in links_style), \ + assert all(element in erPD.subgroup_links_style_similar_phrases_ru for element in links_style), \ "The 'style' attribute value of links mismatches valid values" @allure.title("Verify sizes of background-images in links on the page")