hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-17 06:52:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix offset display in pagination

Browse Source 
first 50 is 1-50, not 0-50
This commit is contained in:
Min RK
2024-03-06 10:44:24 +01:00
parent a09862cb1b
commit 3492cebec2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jupyterhub/tests/browser/test_browser.py
View File

@@ -1041,7 +1041,7 @@ async def test_start_stop_all_servers_on_admin_page(app, browser, admin_user):
) )
@pytest.mark.parametrize("added_count_users", [10, 47, 48, 49, 110]) @pytest.mark.parametrize("added_count_users", [10, 49, 50, 51, 99, 100, 101])
async def test_paging_on_admin_page( async def test_paging_on_admin_page(
app, browser, admin_user, added_count_users, create_user_with_scopes app, browser, admin_user, added_count_users, create_user_with_scopes
): ):
@@ -1057,7 +1057,7 @@ async def test_paging_on_admin_page(
btn_next = browser.get_by_role("button", name="Next") btn_next = browser.get_by_role("button", name="Next")
# verify "Previous"/"Next" button clickability depending on users number on the page # verify "Previous"/"Next" button clickability depending on users number on the page
await expect(displaying).to_have_text( await expect(displaying).to_have_text(
re.compile(".*" + f"0-{min(users_count_db,50)}" + ".*") re.compile(".*" + f"1-{min(users_count_db, 50)}" + ".*")
) )
if users_count_db > 50: if users_count_db > 50:
await expect(btn_next.locator("//span")).to_have_class("active-pagination") await expect(btn_next.locator("//span")).to_have_class("active-pagination")
@@ -1065,10 +1065,10 @@ async def test_paging_on_admin_page(
await btn_next.click() await btn_next.click()
if users_count_db <= 100: if users_count_db <= 100:
await expect(displaying).to_have_text( await expect(displaying).to_have_text(
re.compile(".*" + f"50-{users_count_db}" + ".*") re.compile(".*" + f"51-{users_count_db}" + ".*")
) )
else: else:
await expect(displaying).to_have_text(re.compile(".*" + "50-100" + ".*")) await expect(displaying).to_have_text(re.compile(".*" + "51-100" + ".*"))
await expect(btn_next.locator("//span")).to_have_class("active-pagination") await expect(btn_next.locator("//span")).to_have_class("active-pagination")
await expect(btn_previous.locator("//span")).to_have_class("active-pagination") await expect(btn_previous.locator("//span")).to_have_class("active-pagination")
# click on Previous button # click on Previous button
@@ -1117,7 +1117,7 @@ async def test_search_on_admin_page(
if users_count_db_filtered <= 50: if users_count_db_filtered <= 50:
await expect(filtered_list_on_page).to_have_count(users_count_db_filtered) await expect(filtered_list_on_page).to_have_count(users_count_db_filtered)
await expect(displaying).to_contain_text( await expect(displaying).to_contain_text(
re.compile(f"0-{users_count_db_filtered}") re.compile(f"1-{users_count_db_filtered}")
) )
# check that users names contain the search value in the filtered list # check that users names contain the search value in the filtered list
for element in await filtered_list_on_page.get_by_test_id( for element in await filtered_list_on_page.get_by_test_id(
@@ -1126,7 +1126,7 @@ async def test_search_on_admin_page(
await expect(element).to_contain_text(re.compile(f".*{search_value}.*")) await expect(element).to_contain_text(re.compile(f".*{search_value}.*"))
else: else:
await expect(filtered_list_on_page).to_have_count(50) await expect(filtered_list_on_page).to_have_count(50)
await expect(displaying).to_contain_text(re.compile("0-50")) await expect(displaying).to_contain_text(re.compile("1-50"))
# click on Next button to verify that the rest part of filtered list is displayed on the next page # click on Next button to verify that the rest part of filtered list is displayed on the next page
await browser.get_by_role("button", name="Next").click() await browser.get_by_role("button", name="Next").click()
filtered_list_on_next_page = browser.locator('//tr[@class="user-row"]') filtered_list_on_next_page = browser.locator('//tr[@class="user-row"]')