Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix broken measure unit tests (#69515)

Romeo Van Snick8d285e7bee17
diff --git a/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts b/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts
index f57840831fb..7a054e8082a 100644
--- a/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts
+++ b/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts
@@ -1,9 +1,9 @@
import { createMockMetadata } from "__support__/metadata";
-import { SAMPLE_DATABASE, createQuery } from "metabase-lib/test-helpers";
+import * as Lib from "metabase-lib";
+import { SAMPLE_DATABASE } from "metabase-lib/test-helpers";
import {
createMockField,
createMockMeasure,
- createMockStructuredDatasetQuery,
createMockTable,
} from "metabase-types/api/mocks";
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
@@ -16,18 +16,6 @@ describe("suggestMeasures", () => {
const DATABASE_ID = SAMPLE_DATABASE.id;
const TABLE_ID = 1;
- const MEASURE_BAR = createMockMeasure({
- name: "BAR",
- table_id: TABLE_ID,
- definition: createMockStructuredDatasetQuery({
- database: DATABASE_ID,
- query: {
- "source-table": TABLE_ID,
- aggregation: [["sum", ["field", 11, {}]]],
- },
- }),
- });
-
const TABLE = createMockTable({
db_id: DATABASE_ID,
id: TABLE_ID,
@@ -41,6 +29,7 @@ describe("suggestMeasures", () => {
createMockField({
id: 11,
table_id: TABLE_ID,
+ name: "sum",
display_name: "Sum",
base_type: "type/Float",
}),
@@ -63,7 +52,6 @@ describe("suggestMeasures", () => {
base_type: "type/DateTime",
}),
],
- measures: [MEASURE_BAR],
});
const DATABASE = createSampleDatabase({
@@ -77,15 +65,48 @@ describe("suggestMeasures", () => {
tables: [TABLE],
});
- const query = createQuery({
- metadata,
- query: {
- database: DATABASE.id,
- type: "query",
- query: {
- "source-table": TABLE.id,
+ const metadataProvider = Lib.metadataProvider(DATABASE_ID, metadata);
+
+ const MEASURE_BAR = createMockMeasure({
+ name: "BAR",
+ table_id: TABLE_ID,
+ definition: Lib.toJsQuery(
+ Lib.createTestQuery(metadataProvider, {
+ stages: [
+ {
+ source: {
+ type: "table",
+ id: TABLE_ID,
+ },
+ aggregations: [
+ {
+ type: "operator",
+ operator: "sum",
+ args: [{ type: "column", name: "sum", displayName: "Sum" }],
+ },
+ ],
+ },
+ ],
+ }),
+ ),
+ });
+
+ // Recreate metadata with measure in place
+ const metadataProviderWithMeasure = Lib.metadataProvider(
+ DATABASE_ID,
+ createMockMetadata({
+ databases: [DATABASE],
+ tables: [TABLE],
+ measures: [MEASURE_BAR],
+ }),
+ );
+
+ const query = Lib.createTestQuery(metadataProviderWithMeasure, {
+ stages: [
+ {
+ source: { type: "table", id: TABLE.id },
},
- },
+ ],
});
const source = suggestMeasures({
diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.ts
index 849bce2f7e2..9317b0a3e4f 100644
--- a/frontend/test/__support__/store.ts
+++ b/frontend/test/__support__/store.ts
@@ -22,6 +22,7 @@ import type {
Dashboard,
Database,
Field,
+ Measure,
NativeQuerySnippet,
SavedQuestionDatabase,
Schema,
@@ -42,6 +43,7 @@ export interface EntitiesStateOpts {
tables?: Table[];
fields?: Field[];
segments?: Segment[];
+ measures?: Measure[];
snippets?: NativeQuerySnippet[];
users?: User[];
questions?: Card[];