Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test_data/exercises_ru_words_page_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ class ExercisesRuWordsPageData:
# p = f"{Links.URL_GROUPS_PAGE}/2/series/"
# group_link_urls = (f"{p}1", f"{p}2", f"{p}3", f"{p}4", f"{p}5", f"{p}6", f"{p}17")

q = f"{ExUrls.URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
subgroup_link_urls = (f"{q}1", f"{q}2", f"{q}3", f"{q}4", f"{q}5", f"{q}6", f"{q}7", f"{q}8", f"{q}9", f"{q}10",
f"{q}11", f"{q}12", f"{q}13", f"{q}14", f"{q}15", f"{q}16", f"{q}17", f"{q}18", f"{q}19",
f"{q}20", f"{q}21", f"{q}22", f"{q}23", f"{q}24", f"{q}25", f"{q}26", f"{q}27", f"{q}28",
f"{q}29", f"{q}30", f"{q}31", f"{q}32", f"{q}33", f"{q}34", f"{q}35", f"{q}36", f"{q}37",
f"{q}38", f"{q}39", f"{q}40", f"{q}41", f"{q}42", f"{q}43", f"{q}44", f"{q}45", f"{q}46")
# q = f"{ExUrls.URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
# subgroup_link_urls = (f"{q}1", f"{q}2", f"{q}3", f"{q}4", f"{q}5", f"{q}6", f"{q}7", f"{q}8", f"{q}9", f"{q}10",
# f"{q}11", f"{q}12", f"{q}13", f"{q}14", f"{q}15", f"{q}16", f"{q}17", f"{q}18", f"{q}19",
# f"{q}20", f"{q}21", f"{q}22", f"{q}23", f"{q}24", f"{q}25", f"{q}26", f"{q}27", f"{q}28",
# f"{q}29", f"{q}30", f"{q}31", f"{q}32", f"{q}33", f"{q}34", f"{q}35", f"{q}36", f"{q}37",
# f"{q}38", f"{q}39", f"{q}40", f"{q}41", f"{q}42", f"{q}43", f"{q}44", f"{q}45", f"{q}46")

links_status_code = (200,)

Expand Down
15 changes: 11 additions & 4 deletions test_data/links.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,23 @@ class MainPageLinks:

class ExercisesUrls:
STARTING_POINT = MainPageLinks.URL_GROUPS_PAGE
p = f"{STARTING_POINT}/2/series/"
group_link_urls = (f"{p}1", f"{p}2", f"{p}3", f"{p}4", f"{p}5", f"{p}6", f"{p}17")
a = f"{STARTING_POINT}/2/series/"
group_link_urls = (f"{a}1", f"{a}2", f"{a}3", f"{a}4", f"{a}5", f"{a}6", f"{a}17")

# Speech Exercises RU > Similar Phrases
URL_EXERCISES_RU_SIMILAR_PHRASES_PAGE = f"{STARTING_POINT}/2/series/2"
q = f"{URL_EXERCISES_RU_SIMILAR_PHRASES_PAGE}/subgroup/"
subgroup_link_urls = (f"{q}60", f"{q}61", f"{q}62", f"{q}63", f"{q}64", f"{q}65")
b = f"{URL_EXERCISES_RU_SIMILAR_PHRASES_PAGE}/subgroup/"
subgroup_link_urls = (f"{b}60", f"{b}61", f"{b}62", f"{b}63", f"{b}64", f"{b}65")

# Speech Exercises RU > Words
URL_EXERCISES_RU_WORDS_PAGE = f"{STARTING_POINT}/2/series/1"
c = f"{URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
subgroup_link_urls_ru_words = (
f"{c}1", f"{c}2", f"{c}3", f"{c}4", f"{c}5", f"{c}6", f"{c}7", f"{c}8", f"{c}9", f"{c}10", f"{c}11", f"{c}12",
f"{c}13", f"{c}14", f"{c}15", f"{c}16", f"{c}17", f"{c}18", f"{c}19", f"{c}20", f"{c}21", f"{c}22", f"{c}23",
f"{c}24", f"{c}25", f"{c}26", f"{c}27", f"{c}28", f"{c}29", f"{c}30", f"{c}31", f"{c}32", f"{c}33", f"{c}34",
f"{c}35", f"{c}36", f"{c}37", f"{c}38", f"{c}39", f"{c}40", f"{c}41", f"{c}42", f"{c}43", f"{c}44", f"{c}45",
f"{c}46")

# Speech Exercises > Words > Family
URL_EXERCISE1_MODAL_WINDOW_PAGE = f"{STARTING_POINT}/4/series/9/subgroup/73/exercise/919/task/919"
5 changes: 3 additions & 2 deletions tests/exercises_ru_words_page_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def test_erw_03_03_verify_subgroup_links(self, driver, exercises_ru_words_page_o
assert subgroup_link_titles, "Subgroup link titles values are empty"
assert all(element in erwPD.subgroup_link_titles for element in subgroup_link_titles), \
"Subgroup link titles mismatch valid values"
assert all(element in erwPD.subgroup_link_urls for element in subgroup_links_href), \
assert all(element in ExUrls.subgroup_link_urls_ru_words for element in subgroup_links_href), \
"Attributes 'href' of subgroup links mismatch valid values"
assert all(element in erwPD.links_status_code for element in subgroup_links_status_codes), \
"Status codes of subgroup links mismatch valid values"
Expand All @@ -162,7 +162,8 @@ def test_erw_03_06_verify_subgroup_links_navigation(self, driver, exercises_ru_w
page = erwPage(driver)
opened_pages = page.click_on_subgroup_links()
assert opened_pages, "Transitions to pages have not performed"
assert all(element in erwPD.subgroup_link_urls for element in opened_pages), "Links lead to incorrect pages"
assert all(element in ExUrls.subgroup_link_urls_ru_words for element in opened_pages), \
"Links lead to incorrect pages"

class TestExRuWordsPageImages:
@allure.title("Verify attributes of images in links on the page")
Expand Down