From 3690dbf8b9b533312cfcbbe34473f15819ef2c72 Mon Sep 17 00:00:00 2001 From: Alena Krauch Date: Mon, 12 May 2025 12:32:34 +0300 Subject: [PATCH] update footer_test.py, footer_data.py --- test_data/footer_data.py | 37 +++++++++++++++++++------------------ tests/footer_test.py | 8 +++----- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/test_data/footer_data.py b/test_data/footer_data.py index 9cec0265d3..c3ce5ab3e5 100644 --- a/test_data/footer_data.py +++ b/test_data/footer_data.py @@ -6,29 +6,30 @@ class FooterData: with_the_support_text = ("При поддержке", "With the support") contact_us_link_text = ("Обратная связь", "Contact us") - link_titles = "brainupproject@yandex.ru" + link_titles = ("brainupproject@yandex.ru",) - links_href = ("https://arasaac.org/", - "mailto:brainupproject@yandex.ru?subject=BrainUp", - "https://epam.com/", - "https://www.jetbrains.com/", - "https://reg.ru/", - "https://selectel.ru/") + link1 = "https://arasaac.org/" + link2 = "mailto:brainupproject@yandex.ru?subject=BrainUp" + link3 = "https://epam.com/" + link4 = "https://www.epam.com/" + link5 = "https://www.jetbrains.com/" + link6 = "https://reg.ru/" + link7 = "https://www.reg.ru/" + link8 = f"{link7}?utm_source=brainup.site&utm_medium=referral&utm_campaign=brainup.site&utm_referrer=brainup.site" + link9 = "https://selectel.ru/" + + links_href = (link1, link2, link3, link5, link6, link9) link_status_codes = (200, 403) - images_src = (f"{Links.URL_MAIN_PAGE}logos/logo_ARASAAC_black-6aced95542b919137b28bced5be83596.png", - f"{Links.URL_MAIN_PAGE}logos/epam-cd401151c8ee5f14afbba10b72cd5fea.png", - f"{Links.URL_MAIN_PAGE}logos/jetbrains-variant-4_-fb6c06f46c4a6267ac60e84343940d8b.png", - f"{Links.URL_MAIN_PAGE}logos/reg-ru.svg", - f"{Links.URL_MAIN_PAGE}logos/selectel-f49f7fdb2061466c4f28aa1e128bd9a4.png") + s = f"{Links.URL_MAIN_PAGE}logos/" + images_src = (f"{s}logo_ARASAAC_black-6aced95542b919137b28bced5be83596.png", + f"{s}epam-cd401151c8ee5f14afbba10b72cd5fea.png", + f"{s}jetbrains-variant-4_-fb6c06f46c4a6267ac60e84343940d8b.png", + f"{s}reg-ru.svg", + f"{s}selectel-f49f7fdb2061466c4f28aa1e128bd9a4.png") images_alt = ("ARASAAC", "EPAM", "JetBrains", "Регистратор доменных имен РЕГ.РУ", "Selectel") # Related web pages urls - pages_urls = ("https://arasaac.org/", - "https://www.epam.com/", "https://epam.com/", - "https://www.jetbrains.com/", - "https://www.reg.ru/", "https://reg.ru/", - "https://www.reg.ru/?utm_source=brainup.site&utm_medium=referral&utm_campaign=brainup.site&utm_referrer=brainup.site", - "https://selectel.ru/") + pages_urls = (link1, link3, link4, link5, link6, link7, link8, link9) diff --git a/tests/footer_test.py b/tests/footer_test.py index 68071b98ee..f39cf88379 100644 --- a/tests/footer_test.py +++ b/tests/footer_test.py @@ -92,10 +92,8 @@ def test_fp_03_01_verify_footer_links(self, driver, main_page_open): assert contact_us_link_title, "The link title value is empty" assert contact_us_link_title in fPD.link_titles, "The link title mismatches the valid value" assert links_href, "Links href are empty" - assert all(element in fPD.links_href for element in links_href), \ - "Attributes 'href' of links mismatch valid values" - assert link_prefix_and_subject, \ - "The attribute 'href' of the 'Contact us' link does not contain the proper prefix and/or subject" + assert all(element in fPD.links_href for element in links_href), "Links href mismatch valid values" + assert link_prefix_and_subject, "The Contact us link href doesn't contain the proper prefix and/or subject" assert all(element in fPD.link_status_codes for element in link_status_codes), \ "Status codes of links mismatch valid values" @@ -104,7 +102,7 @@ def test_fp_03_02_verify_links_lead_to_the_correct_pages(self, driver, main_page page = fPage(driver) new_tabs_urls = page.click_on_links() assert all(element in fPD.pages_urls for element in new_tabs_urls), \ - "Links in the Footer lead to incorrect pages after clicking or did not loaded during the allotted time" + "Links in the Footer lead to invalid pages after clicking or don't load during the allotted time" @allure.title("Verify that the 'Contact us' link in the Footer calls an email client") def test_fp_03_03_verify_contact_us_link_calls_an_email_client(self, driver, main_page_open):