Fix flaky x-rays test (#50131)

* Fix flaky test

* Add extra assertion

* Reset hover state

* Change order of assertions

e2e/support/helpers/e2e-visual-tests-helpers.js

@@ -185,6 +185,7 @@ function assertTooltipFooter({ name, value, secondaryValue }) {
 }
 
 export function assertEChartsTooltip({ header, rows, footer, blurAfter }) {
+  echartsTooltip().should("be.visible");
   echartsTooltip().within(() => {
     if (header != null) {
       tooltipHeader().should("have.text", header);

e2e/test/scenarios/dashboard/x-rays.cy.spec.js

@@ -295,11 +295,6 @@ describe("scenarios > x-rays", { tags: "@slow" }, () => {
 
     cy.url().should("contain", "/question");
 
-    cy.findByTestId("viz-settings-button").click();
-    cy.findAllByTestId("chartsettings-field-picker")
-      .contains("User → Source")
-      .should("be.visible");
-
     // Bars
     chartPathWithFillColor("#509EE3").should("have.length", 5);
     chartPathWithFillColor("#509EE3").eq(0).realHover();
@@ -314,6 +309,11 @@ describe("scenarios > x-rays", { tags: "@slow" }, () => {
         },
       ],
     });
+
+    cy.findByTestId("viz-settings-button").click();
+    cy.findAllByTestId("chartsettings-field-picker")
+      .contains("User → Source")
+      .should("be.visible");
   });
 
   it("should be able to open x-ray on a dashcard from a dashboard with multiple tabs", () => {