The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Consolidate joins e2e tests (#83279)
Chris Vandoodewaard635a6c15fa21
diff --git a/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js b/e2e/test/scenarios/joins/joins-reproductions.cy.spec.jsindex 414e9296e34..706d00e80f2 100644--- a/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js+++ b/e2e/test/scenarios/joins/joins-reproductions.cy.spec.js@@ -61,7 +61,7 @@ describe("issue 14793", () => {for (let i = 0; i < XRAY_DATASETS; ++i) {cy.wait("@postDataset");}- expect(xhr.status).not.to.eq(500);+ expect(xhr.response.statusCode).not.to.eq(500);expect(xhr.response.body.cause).not.to.exist;});@@ -127,7 +127,6 @@ describe("issue 15578", () => {beforeEach(() => {H.restore();cy.signInAsAdmin();- cy.intercept("POST", "/api/dataset").as("dataset");// Remap display valuecy.request("POST", `/api/field/${ORDERS.PRODUCT_ID}/dimension`, {@@ -167,14 +166,13 @@ describe("issue 15578", () => {});});-describe("issue 17710", () => {+describe("issue 17710, 39448", () => {beforeEach(() => {- cy.intercept("POST", "/api/dataset").as("dataset");H.restore();- cy.signInAsAdmin();+ cy.signInAsNormalUser();});- it("should remove only invalid join clauses (metabase#17710)", () => {+ it("should suggest join conditions and remove only invalid join clauses (metabase#17710, metabase#39448)", () => {H.openOrdersTable({ mode: "notebook" });cy.button("Join data").click();@@ -183,6 +181,19 @@ describe("issue 17710", () => {cy.findByText("Products").click();});+ cy.log(+ "should load joined table metadata for suggested join conditions (metabase#39448)",+ );+ H.getNotebookStep("join").within(() => {+ cy.findByLabelText("Right table").should("have.text", "Products");+ cy.findByLabelText("Left column")+ .findByText("Product ID")+ .should("be.visible");+ cy.findByLabelText("Right column").findByText("ID").should("be.visible");+ cy.findByLabelText("Change operator").should("have.text", "=");+ });++ cy.log("should remove only invalid join clauses (metabase#17710)");H.getNotebookStep("join").icon("add").click();// Close the LHS column popover that opens automatically@@ -193,8 +204,10 @@ describe("issue 17710", () => {H.openNotebook();cy.findByTestId("step-join-0-0").within(() => {- cy.findByText("ID");- cy.findByText("Product ID");+ cy.findByLabelText("Left column").findByText("Product ID");+ cy.findByLabelText("Right column").findByText("ID");+ cy.findAllByLabelText("Left column").should("have.length", 1);+ cy.findAllByLabelText("Right column").should("have.length", 1);});});});@@ -247,14 +260,11 @@ describe("issue 18502", () => {}beforeEach(() => {- cy.intercept("POST", "/api/dataset").as("dataset");H.restore();cy.signInAsAdmin();});it("should be able to join two saved questions based on the same table (metabase#18502)", () => {- cy.intercept("GET", "/api/collection/*/items?*").as("getCollectionContent");-H.createQuestion(question1);H.createQuestion(question2);@@ -276,7 +286,6 @@ describe("issue 18502", () => {});describe("issue 18818", () => {beforeEach(() => {- cy.intercept("POST", "/api/dataset").as("dataset");H.restore();cy.signInAsAdmin();});@@ -306,7 +315,10 @@ describe("issue 18818", () => {);H.openNotebook();- cy.findAllByText("CC Rating");+ H.getNotebookStep("join").within(() => {+ cy.findByLabelText("Left column").findByText("CC Rating");+ cy.findByLabelText("Right column").findByText("Quantity");+ });});});@@ -540,7 +552,6 @@ describe("issue 23293", () => {// eslint-disable-next-line metabase/no-unsafe-element-filteringcy.findAllByRole("grid").last()- .as("tableResults").should("contain", "Doohickey").and("not.contain", "Gizmo");});@@ -640,8 +651,7 @@ describe("issue 31769", () => {cy.signInAsAdmin();H.createQuestion({ name: "Q1", query: Q1 }).then(() => {- H.createQuestion({ name: "Q2", query: Q2 }).then((response) => {- cy.wrap(response.body.id).as("card_id_q2");+ H.createQuestion({ name: "Q2", query: Q2 }).then(() => {H.startNewQuestion();});});@@ -658,40 +668,14 @@ describe("issue 31769", () => {// Asserting there're two columns from Q1 and two columns from Q2cy.findAllByTestId("header-cell").should("have.length", 4);- cy.get("@card_id_q2").then((cardId) => {- H.tableInteractive()- .findByText("Q2 - Products → Category → Category")- .should("exist");- });+ H.tableInteractive()+ .findByText("Q2 - Products → Category → Category")+ .should("exist");H.tableInteractive().findByText("Products → Category").should("exist");});});-describe("issue 39448", () => {- beforeEach(() => {- H.restore();- cy.signInAsNormalUser();- });-- it("should load joined table metadata for suggested join conditions (metabase#39448)", () => {- H.openOrdersTable({ mode: "notebook" });- cy.findByTestId("action-buttons").button("Join data").click();- H.miniPicker().within(() => {- cy.findByText("Sample Database").click();- cy.findByText("Products").click();- });- H.getNotebookStep("join").within(() => {- cy.findByLabelText("Right table").should("have.text", "Products");- cy.findByLabelText("Left column")- .findByText("Product ID")- .should("be.visible");- cy.findByLabelText("Right column").findByText("ID").should("be.visible");- cy.findByLabelText("Change operator").should("have.text", "=");- });- });-});-// See TODO inside this test when unskippingdescribe("issue 27521", () => {beforeEach(() => {@@ -951,7 +935,7 @@ describe("issue 46675", () => {H.tableInteractive().should("be.visible");});- it("should reset the draft join state when the source table changes (metabase#46675)", () => {+ it("should reset the draft join state when the rhs table changes (metabase#46675)", () => {cy.log("change the rhs table and verify that the state was reset");H.getNotebookStep("join").findByLabelText("Right table")diff --git a/e2e/test/scenarios/joins/joins.cy.spec.js b/e2e/test/scenarios/joins/joins.cy.spec.jsindex 1ea220713b0..275686f2a01 100644--- a/e2e/test/scenarios/joins/joins.cy.spec.js+++ b/e2e/test/scenarios/joins/joins.cy.spec.js@@ -39,7 +39,9 @@ describe("scenarios > question > joined questions", () => {lhsSampleColumn: "Product ID",rhsSampleColumn: "Reviews - Product → Reviewer",});- H.queryBuilderMain().findByText("Body").should("not.exist");+ H.queryBuilderMain()+ .findByText("Reviews - Product → Body")+ .should("not.exist");// Post-join filters on the joined table (metabase#12221, metabase#15570)H.openNotebook();@@ -128,7 +130,9 @@ describe("scenarios > question > joined questions", () => {lhsSampleColumn: "TOTAL",rhsSampleColumn: "question b - PRODUCT_ID → RATING",});- H.queryBuilderMain().findByText("EAN").should("not.exist");+ H.queryBuilderMain()+ .findByText("question b - PRODUCT_ID → EAN")+ .should("not.exist");H.openNotebook();H.filter({ mode: "notebook" });@@ -156,10 +160,6 @@ describe("scenarios > question > joined questions", () => {});it("should join structured questions (metabase#13000, metabase#13649, metabase#13744)", () => {- cy.intercept("GET", `/api/table/${PRODUCTS_ID}/query_metadata`).as(- "metadata",- );-H.createQuestion({name: "Q1",query: {@@ -202,7 +202,7 @@ describe("scenarios > question > joined questions", () => {lhsSampleColumn: "Product ID",rhsSampleColumn: "Q2 - Product → Sum of Rating",});- H.queryBuilderMain().findByText("Q2 → ID").should("not.exist");+ H.queryBuilderMain().findByText("Q2 - Product → ID").should("not.exist");H.openNotebook();// add a custom column on top of the steps from the #13000 repro which was simply asserting@@ -253,7 +253,6 @@ describe("scenarios > question > joined questions", () => {});it("should allow joins with multiple conditions", () => {- cy.intercept("POST", "/api/dataset").as("dataset");H.openOrdersTable({ mode: "notebook" });H.join();