diff --git a/apps/trading/e2e/tests/deal_ticket/test_stop_isolated_cross_margin.py b/apps/trading/e2e/tests/deal_ticket/test_isolated_cross_margin.py similarity index 83% rename from apps/trading/e2e/tests/deal_ticket/test_stop_isolated_cross_margin.py rename to apps/trading/e2e/tests/deal_ticket/test_isolated_cross_margin.py index e6112903e..c592b2712 100644 --- a/apps/trading/e2e/tests/deal_ticket/test_stop_isolated_cross_margin.py +++ b/apps/trading/e2e/tests/deal_ticket/test_isolated_cross_margin.py @@ -18,12 +18,11 @@ def create_position(vega: VegaServiceNull, market_id): @pytest.mark.usefixtures("auth", "risk_accepted") -def test_isolated_margin( +def test_switch_cross_isolated_margin( continuous_market, vega: VegaServiceNull, page: Page): create_position(vega, continuous_market) page.goto(f"/#/markets/{continuous_market}") - expect(page.locator(margin_row).nth(1) - ).to_have_text("874.21992Cross1.0x") + expect(page.locator(margin_row).nth(1)).to_have_text("874.21992Cross1.0x") # tbd - tooltip is not visible without this wait page.wait_for_timeout(1000) page.get_by_test_id(tab_positions).get_by_text("Cross").hover() @@ -46,3 +45,9 @@ def test_isolated_margin( expect(page.get_by_test_id(tooltip_content).nth(0)).to_have_text( "Liquidation: 583.62409Margin: 11,109.99996Order: 11,000.00" ) + page.get_by_role("button", name="Cross").click() + page.get_by_role("button", name="Confirm").click() + wait_for_toast_confirmation(page) + next_epoch(vega=vega) + expect(page.locator(margin_row).nth(1)).to_have_text( + "22,109.99996Cross1.0x") diff --git a/apps/trading/e2e/tests/positions/test_collateral.py b/apps/trading/e2e/tests/positions/test_collateral.py index af1073c7c..5867b37b3 100644 --- a/apps/trading/e2e/tests/positions/test_collateral.py +++ b/apps/trading/e2e/tests/positions/test_collateral.py @@ -28,8 +28,9 @@ def test_usage_breakdown(continuous_market, page: Page): usage_breakdown = page.get_by_test_id("usage-breakdown") # Verify headers - headers = ["Market", "Account type", "Balance", "Margin health"] - ag_headers = usage_breakdown.locator(".ag-header-cell-text").element_handles() + headers = ["Market", "Account type", "Balance"] + ag_headers = usage_breakdown.locator( + ".ag-header-cell-text").element_handles() for i, header_element in enumerate(ag_headers): header_text = header_element.text_content() assert header_text == headers[i] @@ -38,30 +39,10 @@ def test_usage_breakdown(continuous_market, page: Page): expect(usage_breakdown.locator('[class="mb-2 text-sm"]')).to_have_text( "You have 1,000,000.00 tDAI in total." ) - expect(usage_breakdown.locator(COL_ID_USED).first).to_have_text("8.50269 (0%)") + expect(usage_breakdown.locator( + COL_ID_USED).first).to_have_text("8.50269 (0%)") expect(usage_breakdown.locator(COL_ID_USED).nth(1)).to_have_text( "999,991.49731 (99%)" ) - # Maintenance Level - expect( - usage_breakdown.locator( - ".ag-center-cols-container [col-id='market.id'] .ag-cell-value" - ).first - ).to_have_text("2.85556 above maintenance level") - - # Margin health tooltip - usage_breakdown.get_by_test_id("margin-health-chart-track").hover() - tooltip_data = [ - ("maintenance level", "5.64713"), - ("search level", "6.21184"), - ("initial level", "8.47069"), - ("balance", "8.50269"), - ("release level", "9.60012"), - ] - - for index, (label, value) in enumerate(tooltip_data): - expect(page.get_by_test_id(TOOLTIP_LABEL).nth(index)).to_have_text(label) - expect(page.get_by_test_id(TOOLTIP_VALUE).nth(index)).to_have_text(value) - page.get_by_test_id("dialog-close").click()