Fixes

Author: mayagbarnes

e2e_playwright/pivot_table_interactions_test.py

@@ -34,16 +34,16 @@ def test_header_menu_sort_key_asc(page_at_app: Page):
     menu = page.get_by_test_id("header-menu-Region")
     expect(menu).to_be_visible(timeout=5000)
 
-    menu.get_by_test_id("header-sort-key-asc").evaluate("el => el.click()")
-
-    expect(container.get_by_test_id("pivot-row-header").first).to_have_text(
-        "East", timeout=10000
-    )
-
-    row_headers = [
+    row_headers_before = [
         h.inner_text() for h in container.get_by_test_id("pivot-row-header").all()
     ]
-    assert row_headers == sorted(row_headers), f"Rows not sorted A->Z: {row_headers}"
+    expected_headers = sorted(row_headers_before)
+
+    menu.get_by_test_id("header-sort-key-asc").click(force=True)
+
+    expect(container.get_by_test_id("pivot-row-header")).to_have_text(
+        expected_headers, timeout=10000
+    )
 
 
 def test_header_menu_sort_key_desc(page_at_app: Page):
@@ -59,21 +59,14 @@ def test_header_menu_sort_key_desc(page_at_app: Page):
     row_headers_before = [
         h.inner_text() for h in container.get_by_test_id("pivot-row-header").all()
     ]
+    expected_headers = sorted(row_headers_before, reverse=True)
     sort_button = menu.get_by_test_id("header-sort-key-desc")
     sort_button.evaluate("el => el.click()")
 
-    expect(container.get_by_test_id("pivot-row-header").first).to_have_text(
-        "West", timeout=10000
+    expect(container.get_by_test_id("pivot-row-header")).to_have_text(
+        expected_headers, timeout=10000
     )
 
-    row_headers = [
-        h.inner_text() for h in container.get_by_test_id("pivot-row-header").all()
-    ]
-    assert row_headers != row_headers_before
-    assert row_headers == sorted(
-        row_headers, reverse=True
-    ), f"Rows not sorted Z->A: {row_headers}"
-
 
 def test_header_menu_sort_by_value(page_at_app: Page):
     """Sorting by value via header menu reorders rows by aggregated measure."""
@@ -89,10 +82,14 @@ def test_header_menu_sort_by_value(page_at_app: Page):
         h.inner_text() for h in container.get_by_test_id("pivot-row-header").all()
     ]
     menu.get_by_test_id("header-sort-value-desc").evaluate("el => el.click()")
+    page.get_by_test_id("header-sort-value-field").select_option("Revenue")
+    page.get_by_test_id("header-sort-col-key").select_option("")
 
-    expect(container.get_by_test_id("pivot-row-header").first).to_have_text(
-        "South", timeout=10000
+    expect(container.get_by_test_id("pivot-row-header")).to_have_text(
+        ["South", "North", "West", "East"],
+        timeout=10000,
     )
+
     row_headers_after = [
         h.inner_text() for h in container.get_by_test_id("pivot-row-header").all()
     ]
@@ -176,12 +173,12 @@ def test_header_menu_show_values_as_pct(page_at_app: Page):
 
     trigger = container.get_by_test_id("header-menu-trigger-Revenue").first
     expect(trigger).to_be_visible(timeout=5000)
-    trigger.click()
+    trigger.click(force=True)
 
-    display_group = container.get_by_test_id("header-menu-display")
+    display_group = page.get_by_test_id("header-menu-display")
     expect(display_group).to_be_visible(timeout=5000)
 
-    container.get_by_test_id("header-display-pct_of_total").click()
+    page.get_by_test_id("header-display-pct_of_total").click(force=True)
 
     cells = container.get_by_test_id("pivot-data-cell")
     expect(cells.first).to_contain_text("%", timeout=10000)

e2e_playwright/pivot_table_test.py

@@ -121,8 +121,9 @@ def test_state_persists_across_rerun(page_at_app: Page):
         "Region", timeout=10000
     )
 
-    page.get_by_role("button", name="Trigger rerun").scroll_into_view_if_needed()
-    page.get_by_role("button", name="Trigger rerun").click()
+    rerun_button = page.get_by_role("button", name="Trigger rerun")
+    expect(rerun_button).to_be_visible(timeout=10000)
+    rerun_button.click()
     expect(page.get_by_text("Reruns:")).to_be_visible(timeout=10000)
 
     container = get_pivot(page, "test_pivot")