Skip to content

Commit 352499f

Browse files
ref test_erw_03.03, _03.06 Verify subgroup links
update exercises_ru_words_page_test.py, exercises_ru_words_page_data.py, links.py #433
1 parent 0fc92ad commit 352499f

3 files changed

Lines changed: 20 additions & 12 deletions

File tree

test_data/exercises_ru_words_page_data.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ class ExercisesRuWordsPageData:
4949
# p = f"{Links.URL_GROUPS_PAGE}/2/series/"
5050
# group_link_urls = (f"{p}1", f"{p}2", f"{p}3", f"{p}4", f"{p}5", f"{p}6", f"{p}17")
5151

52-
q = f"{ExUrls.URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
53-
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",
54-
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",
55-
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",
56-
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",
57-
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")
52+
# q = f"{ExUrls.URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
53+
# 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",
54+
# 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",
55+
# 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",
56+
# 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",
57+
# 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")
5858

5959
links_status_code = (200,)
6060

test_data/links.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,23 @@ class MainPageLinks:
1818

1919
class ExercisesUrls:
2020
STARTING_POINT = MainPageLinks.URL_GROUPS_PAGE
21-
p = f"{STARTING_POINT}/2/series/"
22-
group_link_urls = (f"{p}1", f"{p}2", f"{p}3", f"{p}4", f"{p}5", f"{p}6", f"{p}17")
21+
a = f"{STARTING_POINT}/2/series/"
22+
group_link_urls = (f"{a}1", f"{a}2", f"{a}3", f"{a}4", f"{a}5", f"{a}6", f"{a}17")
2323

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

2929
# Speech Exercises RU > Words
3030
URL_EXERCISES_RU_WORDS_PAGE = f"{STARTING_POINT}/2/series/1"
31+
c = f"{URL_EXERCISES_RU_WORDS_PAGE}/subgroup/"
32+
subgroup_link_urls_ru_words = (
33+
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",
34+
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",
35+
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",
36+
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",
37+
f"{c}46")
3138

3239
# Speech Exercises > Words > Family
3340
URL_EXERCISE1_MODAL_WINDOW_PAGE = f"{STARTING_POINT}/4/series/9/subgroup/73/exercise/919/task/919"

tests/exercises_ru_words_page_test.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_erw_03_03_verify_subgroup_links(self, driver, exercises_ru_words_page_o
138138
assert subgroup_link_titles, "Subgroup link titles values are empty"
139139
assert all(element in erwPD.subgroup_link_titles for element in subgroup_link_titles), \
140140
"Subgroup link titles mismatch valid values"
141-
assert all(element in erwPD.subgroup_link_urls for element in subgroup_links_href), \
141+
assert all(element in ExUrls.subgroup_link_urls_ru_words for element in subgroup_links_href), \
142142
"Attributes 'href' of subgroup links mismatch valid values"
143143
assert all(element in erwPD.links_status_code for element in subgroup_links_status_codes), \
144144
"Status codes of subgroup links mismatch valid values"
@@ -162,7 +162,8 @@ def test_erw_03_06_verify_subgroup_links_navigation(self, driver, exercises_ru_w
162162
page = erwPage(driver)
163163
opened_pages = page.click_on_subgroup_links()
164164
assert opened_pages, "Transitions to pages have not performed"
165-
assert all(element in erwPD.subgroup_link_urls for element in opened_pages), "Links lead to incorrect pages"
165+
assert all(element in ExUrls.subgroup_link_urls_ru_words for element in opened_pages), \
166+
"Links lead to incorrect pages"
166167

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

0 commit comments

Comments
 (0)