From a616d3b6abdf35034f065e2e44900229cf461e82 Mon Sep 17 00:00:00 2001
From: Romeo Van Snick <romeo@romeovansnick.be>
Date: Fri, 3 May 2024 08:48:28 +0200
Subject: [PATCH] Add tests for url and email columns (#42144)
* Add test for email extractions
* Fix swapped domain and host examples
* Add tests for URL columns
* Fix examples for shortcut too
* Use arrow function instead of function
---
.../column_extract_drill.cy.spec.js | 93 ++++++++++++++++++-
.../expressions/ExtractColumn/util.ts | 4 +-
.../column-extract-drill.tsx | 4 +-
3 files changed, 95 insertions(+), 6 deletions(-)
diff --git a/e2e/test/scenarios/visualizations-tabular/drillthroughs/column_extract_drill.cy.spec.js b/e2e/test/scenarios/visualizations-tabular/drillthroughs/column_extract_drill.cy.spec.js
index 448def481d6..4c4d10cfa0a 100644
--- a/e2e/test/scenarios/visualizations-tabular/drillthroughs/column_extract_drill.cy.spec.js
+++ b/e2e/test/scenarios/visualizations-tabular/drillthroughs/column_extract_drill.cy.spec.js
@@ -11,6 +11,7 @@ import {
getNotebookStep,
openNotebook,
openOrdersTable,
+ openPeopleTable,
popover,
resetSnowplow,
restore,
@@ -18,7 +19,7 @@ import {
visualize,
} from "e2e/support/helpers";
-const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
+const { ORDERS, ORDERS_ID, PEOPLE } = SAMPLE_DATABASE;
const DATE_CASES = [
{
@@ -53,6 +54,37 @@ const DATE_CASES = [
},
];
+const EMAIL_CASES = [
+ {
+ option: "Domain",
+ value: "yahoo",
+ example: "example, online",
+ },
+ {
+ option: "Host",
+ value: "yahoo.com",
+ example: "example.com, online.com",
+ },
+];
+
+const URL_CASES = [
+ {
+ option: "Domain",
+ value: "yahoo",
+ example: "example, online",
+ },
+ {
+ option: "Subdomain",
+ value: "",
+ example: "www, maps",
+ },
+ {
+ option: "Host",
+ value: "yahoo.com",
+ example: "example.com, online.com",
+ },
+];
+
const DATE_QUESTION = {
query: {
"source-table": ORDERS_ID,
@@ -86,6 +118,7 @@ describeWithSnowplow("extract action", () => {
option,
value,
example,
+ extraction: "Extract day, month…",
});
});
});
@@ -97,6 +130,7 @@ describeWithSnowplow("extract action", () => {
extractColumnAndCheck({
column: "Created At",
option: "Year",
+ extraction: "Extract day, month…",
});
const columnIndex = 7;
checkColumnIndex({
@@ -114,6 +148,7 @@ describeWithSnowplow("extract action", () => {
extractColumnAndCheck({
column: "Created At",
option: "Year",
+ extraction: "Extract day, month…",
});
const columnIndex = 7;
checkColumnIndex({
@@ -168,6 +203,7 @@ describeWithSnowplow("extract action", () => {
extractColumnAndCheck({
column: "Created At",
option: "Year",
+ extraction: "Extract day, month…",
});
const columnIndex = 1;
checkColumnIndex({
@@ -187,6 +223,7 @@ describeWithSnowplow("extract action", () => {
column: "Created At: Month",
option: "Month of year",
value: "Apr",
+ extraction: "Extract day, month…",
});
});
@@ -196,6 +233,7 @@ describeWithSnowplow("extract action", () => {
column: "Min of Created At: Default",
option: "Year",
value: "2,022",
+ extraction: "Extract day, month…",
});
});
@@ -205,11 +243,13 @@ describeWithSnowplow("extract action", () => {
column: "Created At",
option: "Hour of day",
newColumn: "Hour of day",
+ extraction: "Extract day, month…",
});
extractColumnAndCheck({
column: "Created At",
option: "Hour of day",
newColumn: "Hour of day_2",
+ extraction: "Extract day, month…",
});
});
@@ -219,6 +259,7 @@ describeWithSnowplow("extract action", () => {
column: "Created At",
option: "Year",
value: "2,025",
+ extraction: "Extract day, month…",
});
openNotebook();
getNotebookStep("expression").findByText("Year").click();
@@ -237,6 +278,53 @@ describeWithSnowplow("extract action", () => {
column: "Created At",
option: "Tag der Woche",
value: "Dienstag",
+ extraction: "Extract day, month…",
+ });
+ });
+ });
+
+ describe("email columns", () => {
+ beforeEach(() => {
+ restore();
+ cy.signInAsAdmin();
+ });
+
+ EMAIL_CASES.forEach(({ option, value, example }) => {
+ it(option, () => {
+ openPeopleTable({ limit: 1 });
+ extractColumnAndCheck({
+ column: "Email",
+ option,
+ value,
+ example,
+ extraction: "Extract domain, host…",
+ });
+ });
+ });
+ });
+
+ describe("url columns", () => {
+ beforeEach(function () {
+ restore();
+ cy.signInAsAdmin();
+
+ // Make the Email column a URL column for these tests, to avoid having to create a new model
+ cy.request("PUT", `/api/field/${PEOPLE.EMAIL}`, {
+ semantic_type: "type/URL",
+ });
+ });
+
+ URL_CASES.forEach(({ option, value, example }) => {
+ it(option, () => {
+ openPeopleTable({ limit: 1 });
+
+ extractColumnAndCheck({
+ column: "Email",
+ option,
+ value,
+ example,
+ extraction: "Extract domain, subdomain…",
+ });
});
});
});
@@ -246,13 +334,14 @@ function extractColumnAndCheck({
column,
option,
newColumn = option,
+ extraction,
value,
example,
}) {
const requestAlias = _.uniqueId("dataset");
cy.intercept("POST", "/api/dataset").as(requestAlias);
cy.findByRole("columnheader", { name: column }).click();
- popover().findByText("Extract day, month…").click();
+ popover().findByText(extraction).click();
cy.wait(1);
if (example) {
diff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.ts b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.ts
index 31601aae74c..ffabe37e5e0 100644
--- a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.ts
+++ b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.ts
@@ -19,9 +19,9 @@ export function getExample(info: Lib.ColumnExtractionInfo) {
case "year":
return "2023, 2024";
case "domain":
- return "example.com, online.com";
- case "host":
return "example, online";
+ case "host":
+ return "example.com, online.com";
case "subdomain":
return "www, maps";
}
diff --git a/frontend/src/metabase/querying/utils/drills/column-extract-drill/column-extract-drill.tsx b/frontend/src/metabase/querying/utils/drills/column-extract-drill/column-extract-drill.tsx
index 3bbb19477a4..7d648a3e0bf 100644
--- a/frontend/src/metabase/querying/utils/drills/column-extract-drill/column-extract-drill.tsx
+++ b/frontend/src/metabase/querying/utils/drills/column-extract-drill/column-extract-drill.tsx
@@ -83,9 +83,9 @@ export function getExample(info: Lib.ColumnExtractionInfo) {
case "year":
return "2023, 2024";
case "domain":
- return "example.com, online.com";
- case "host":
return "example, online";
+ case "host":
+ return "example.com, online.com";
case "subdomain":
return "www, maps";
}
--
GitLab