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
test: cleanup jest warnings from querying folder (#74753)
Uladzimir Havenchyk01c49647f761
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.jsindex c8fb540032a..481e6dfed4d 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.unit.spec.js@@ -379,7 +379,7 @@ describe("DataSelector", () => {expect(screen.getByText("Table in First Schema")).toBeInTheDocument();});- it("should open database picker with correct database selected", () => {+ it("should open database picker with correct database selected", async () => {render(<DataSelectorsteps={["DATABASE"]}@@ -392,7 +392,7 @@ describe("DataSelector", () => {);expect(- screen.getByRole("heading", { name: "Sample Database" }),+ await screen.findByRole("heading", { name: "Sample Database" }),).toBeInTheDocument();});@@ -444,7 +444,7 @@ describe("DataSelector", () => {expect(screen.getByText("Orders")).toBeInTheDocument();});- it("shows an empty state without any databases", () => {+ it("shows an empty state without any databases", async () => {render(<DataSelectorsteps={["DATABASE", "SCHEMA", "TABLE"]}@@ -455,7 +455,9 @@ describe("DataSelector", () => {);expect(- screen.getByText("To pick some data, you'll need to add some first"),+ await screen.findByText(+ "To pick some data, you'll need to add some first",+ ),).toBeInTheDocument();});@@ -475,10 +477,10 @@ describe("DataSelector", () => {{ storeInitialState },);- expect(screen.getByText("Saved Questions")).toBeInTheDocument();+ expect(await screen.findByText("Saved Questions")).toBeInTheDocument();});- it("should not show 'Saved Questions' option when there are no saved questions (metabase#29760)", () => {+ it("should not show 'Saved Questions' option when there are no saved questions (metabase#29760)", async () => {renderWithProviders(<DataSelectoravailableModels={[]}@@ -494,6 +496,7 @@ describe("DataSelector", () => {{ storeInitialState },);+ expect(await screen.findByText("Orders")).toBeInTheDocument();expect(screen.queryByText("Saved Questions")).not.toBeInTheDocument();});});diff --git a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsxindex fd1c6630326..43ad9c03d63 100644--- a/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx@@ -2,6 +2,7 @@ import _userEvent from "@testing-library/user-event";import type { ReactNode } from "react";import { renderWithProviders, screen } from "__support__/ui";+import { waitForFloatingPosition } from "__support__/utils";import { DATE_PICKER_UNITS } from "metabase/querying/common/constants";import type {DatePickerUnit,@@ -37,7 +38,7 @@ interface SetupOpts {renderSubmitButton?: (props: DatePickerSubmitButtonProps) => ReactNode;}-function setup({+async function setup({value,availableUnits = DATE_PICKER_UNITS,minDate,@@ -59,6 +60,8 @@ function setup({/>,);+ await waitForFloatingPosition();+return { onChange, onSubmit };}@@ -74,7 +77,7 @@ describe("DateOffsetIntervalPicker", () => {const defaultValue = getDefaultValue(direction);it("should change the interval", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -93,7 +96,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should change the interval with a negative value", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -109,7 +112,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should coerce zero", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -126,7 +129,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should ignore empty values", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -140,7 +143,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should ignore invalid values", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -155,7 +158,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should allow to change the unit", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -171,7 +174,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should allow to set only available units", async () => {- setup({+ await setup({value: defaultValue,availableUnits: ["day", "year"],});@@ -191,7 +194,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should change the offset interval", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -207,7 +210,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should change the offset interval with a negative value", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -223,7 +226,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should accept zero offset interval", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -240,7 +243,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should ignore an empty offset interval", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -254,7 +257,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should ignore invalid offset values", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -269,7 +272,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should allow to change the offset unit", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -288,7 +291,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should only show offset units larger or equal to the current one", async () => {- setup({+ await setup({value: {...defaultValue,unit: "month",@@ -310,8 +313,8 @@ describe("DateOffsetIntervalPicker", () => {).not.toBeInTheDocument();});- it("should display the actual date range", () => {- setup({+ it("should display the actual date range", async () => {+ await setup({value: defaultValue,});const rangeText =@@ -322,7 +325,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should be able to remove the offset", async () => {- const { onChange, onSubmit } = setup({+ const { onChange, onSubmit } = await setup({value: defaultValue,});@@ -338,16 +341,16 @@ describe("DateOffsetIntervalPicker", () => {it("should pass the value to the submit button callback", async () => {const renderSubmitButton = jest.fn().mockReturnValue(null);- setup({ value: defaultValue, renderSubmitButton });+ await setup({ value: defaultValue, renderSubmitButton });expect(renderSubmitButton).toHaveBeenCalledWith({value: defaultValue,isDisabled: false,});});- it("should disable submit when the range falls outside the bounds", () => {+ it("should disable submit when the range falls outside the bounds", async () => {const renderSubmitButton = jest.fn().mockReturnValue(null);- setup({+ await setup({value: defaultValue,minDate: direction === "past" ? new Date(2020, 0, 1) : undefined,maxDate: direction === "future" ? new Date(2020, 0, 2) : undefined,@@ -360,7 +363,7 @@ describe("DateOffsetIntervalPicker", () => {});it("should not submit when the range falls outside the bounds", async () => {- const { onSubmit } = setup({+ const { onSubmit } = await setup({value: defaultValue,minDate: direction === "past" ? new Date(2020, 0, 1) : undefined,maxDate: direction === "future" ? new Date(2020, 0, 2) : undefined,diff --git a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsxindex 19d04fe454c..a4ee3e31dd6 100644--- a/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsx@@ -6,7 +6,7 @@ import { EditorState } from "@codemirror/state";import fetchMock from "fetch-mock";import { mockSettings } from "__support__/settings";-import { renderWithProviders, waitFor } from "__support__/ui";+import { act, renderWithProviders, waitFor } from "__support__/ui";import type { State } from "metabase/redux/store";import { createMockState } from "metabase/redux/store/mocks";import { isNotNull } from "metabase/utils/types";@@ -43,8 +43,9 @@ function completer(storeInitialState: state,});- return (doc: string) => {- if (!completer) {+ return async (doc: string) => {+ const activeCompleter = completer;+ if (!activeCompleter) {return null;}@@ -61,7 +62,13 @@ function completer(});const ctx = new CompletionContext(state, cur, false);- return completer(ctx);+ // Completers may trigger RTK Query requests, whose subscription state+ // updates re-render the Wrapper; run inside act so they stay wrapped.+ let result: Awaited<ReturnType<CompletionSource>> = null;+ await act(async () => {+ result = await activeCompleter(ctx);+ });+ return result;};}diff --git a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsxindex 9a2d1aa8dbe..0cb6da43be8 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsx@@ -59,6 +59,10 @@ describe("HelpText (OSS)", () => {},});+ // Wait for the async-formatted example so HighlightExpressionParts+ // settles before the test ends.+ await screen.findByText('concat([Last Name], ", ", [First Name])');+const argumentsBlock = screen.getByTestId("expression-helper-popover-arguments",);@@ -109,6 +113,10 @@ describe("HelpText (OSS)", () => {showMetabaseLinks: true,});+ // Wait for the async-formatted example so HighlightExpressionParts+ // settles before the test ends.+ await screen.findByText('concat([Last Name], ", ", [First Name])');+expect(screen.getByRole("img", { name: "reference icon" }),).toBeInTheDocument();@@ -123,6 +131,10 @@ describe("HelpText (OSS)", () => {showMetabaseLinks: false,});+ // Wait for the async-formatted example so HighlightExpressionParts+ // settles before the test ends.+ await screen.findByText('concat([Last Name], ", ", [First Name])');+expect(screen.getByRole("img", { name: "reference icon" }),).toBeInTheDocument();diff --git a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsxindex c39b7f472af..5065a0789cb 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsx@@ -19,6 +19,10 @@ describe("ExpressionEditorHelpText (EE with token)", () => {showMetabaseLinks: true,});+ // Wait for the async-formatted example so HighlightExpressionParts+ // settles before the test ends.+ await screen.findByText('concat([Last Name], ", ", [First Name])');+expect(screen.getByRole("img", { name: "reference icon" }),).toBeInTheDocument();@@ -31,6 +35,10 @@ describe("ExpressionEditorHelpText (EE with token)", () => {showMetabaseLinks: false,});+ // Wait for the async-formatted example so HighlightExpressionParts+ // settles before the test ends.+ await screen.findByText('concat([Last Name], ", ", [First Name])');+expect(screen.queryByRole("img", { name: "reference icon" }),).not.toBeInTheDocument();diff --git a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsxindex 68dcd67b128..ec9f73cad55 100644--- a/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx+++ b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsx@@ -1,7 +1,7 @@import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { createMockMetadata } from "__support__/metadata";import { mockSettings } from "__support__/settings";-import { renderWithProviders } from "__support__/ui";+import { renderWithProviders, screen, waitFor } from "__support__/ui";import { getHelpText } from "metabase/querying/expressions";import { createMockState } from "metabase/redux/store/mocks";import { checkNotNull } from "metabase/utils/types";@@ -72,6 +72,13 @@ export async function setup({storeInitialState: state,});+ // The example expression is highlighted asynchronously; wait for it to+ // settle so its state update does not land after the test has finished.+ const example = screen.queryByTestId("helptext-example");+ if (example) {+ await waitFor(() => expect(example).not.toBeEmptyDOMElement());+ }+const helpText = getHelpText(checkNotNull(enclosingFunction?.name),database,diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsxindex f7f15b9f81e..6e122b648bb 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.unit.spec.tsx@@ -340,7 +340,7 @@ describe("FilterPicker", () => {expect(screen.getByTestId("date-filter-picker")).toBeInTheDocument();});- it("should open the expression editor when column type isn't supported", () => {+ it("should open the expression editor when column type isn't supported", async () => {const query = Lib.filter(createQuery(),-1,@@ -350,6 +350,13 @@ describe("FilterPicker", () => {setup({ query, filter });expect(screen.getByText(/Custom expression/i)).toBeInTheDocument();+ // the expression editor formats its source asynchronously; wait for it+ // to settle so the resulting state updates stay inside act()+ await waitFor(() =>+ expect(+ screen.getByTestId("custom-expression-query-editor"),+ ).toHaveProperty("readOnly", false),+ );});});@@ -442,9 +449,11 @@ describe("FilterPicker", () => {it("should open the expression editor for unsupported expressions", async () => {setup(createQueryWithNullStringFilter());- expect(- screen.getByTestId("custom-expression-query-editor"),- ).toBeInTheDocument();+ const editor = screen.getByTestId("custom-expression-query-editor");+ expect(editor).toBeInTheDocument();+ // the expression editor formats its source asynchronously; wait for it+ // to settle so the resulting state updates stay inside act()+ await waitFor(() => expect(editor).toHaveProperty("readOnly", false));});it("should update a filter with a numeric custom expression", async () => {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsxindex 82338970f4d..21e52f421d0 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx@@ -1,7 +1,7 @@import _userEvent from "@testing-library/user-event";import dayjs from "dayjs";-import { renderWithProviders, screen, within } from "__support__/ui";+import { renderWithProviders, screen, waitFor, within } from "__support__/ui";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";@@ -95,6 +95,12 @@ async function setOperator(operator: string) {await userEvent.click(await screen.findByRole("menuitem", { name: operator }),);+ // Selecting an operator closes the Mantine Popover. Wait for the menu to be+ // gone so the close transition settles within the test instead of leaking+ // an act warning.+ await waitFor(() =>+ expect(screen.queryByRole("menu")).not.toBeInTheDocument(),+ );}describe("TimeFilterPicker", () => {diff --git a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.unit.spec.tsxindex b837dd05c9c..1c56b5c6f2f 100644--- a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.unit.spec.tsx@@ -1,6 +1,7 @@import _userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";+import { waitForFloatingPosition } from "__support__/utils";import * as Lib from "metabase-lib";import {DEFAULT_TEST_QUERY,@@ -80,6 +81,7 @@ describe("TimeseriesFilterPicker", () => {const { getNextFilterParts } = setup();await userEvent.click(screen.getByText("All time"));+ await waitForFloatingPosition();await userEvent.click(await screen.findByDisplayValue("All time"));await userEvent.click(await screen.findByText("Current"));await userEvent.click(screen.getByText("Apply"));@@ -94,6 +96,7 @@ describe("TimeseriesFilterPicker", () => {const { getNextFilterParts } = setup({ query, column, filter });await userEvent.click(screen.getByText("Jan 10, 2020"));+ await waitForFloatingPosition();const input = await screen.findByLabelText("Date");await userEvent.clear(input);await userEvent.type(input, "Feb 20, 2020");@@ -111,6 +114,7 @@ describe("TimeseriesFilterPicker", () => {const { getNextFilterParts } = setup({ query, column, filter });await userEvent.click(screen.getByText("Jan 10, 2020"));+ await waitForFloatingPosition();await userEvent.click(await screen.findByDisplayValue("On"));await userEvent.click(await screen.findByText("All time"));await userEvent.click(screen.getByText("Apply"));diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsxindex 0614141dbf1..01414660b98 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/common.unit.spec.tsx@@ -2,6 +2,7 @@ import userEvent from "@testing-library/user-event";import { createMockMetadata } from "__support__/metadata";import { fireEvent, getIcon, screen } from "__support__/ui";+import { mockGetBoundingClientRect } from "__support__/utils";import { METAKEY } from "metabase/utils/browser";import { checkNotNull } from "metabase/utils/types";import * as Lib from "metabase-lib";@@ -68,13 +69,13 @@ const createQueryWithBreakout = () => {return Lib.breakout(query, 0, column);};-function setup(opts: SetupOpts = {}) {+async function setup(opts: SetupOpts = {}) {return baseSetup({...opts,});}-const setupEmptyQuery = () => {+const setupEmptyQuery = async () => {const question = Question.create({DEPRECATED_RAW_MBQL_databaseId: SAMPLE_DB_ID,});@@ -84,7 +85,8 @@ const setupEmptyQuery = () => {describe("DataStep", () => {const scrollBy = HTMLElement.prototype.scrollBy;- const getBoundingClientRect = HTMLElement.prototype.getBoundingClientRect;++ mockGetBoundingClientRect();beforeAll(() => {HTMLElement.prototype.scrollBy = jest.fn();@@ -105,13 +107,12 @@ describe("DataStep", () => {afterAll(() => {HTMLElement.prototype.scrollBy = scrollBy;- HTMLElement.prototype.getBoundingClientRect = getBoundingClientRect;jest.resetAllMocks();});it("should render without a table selected", async () => {- setupEmptyQuery();+ await setupEmptyQuery();expect(await screen.findByTestId("mini-picker")).toBeInTheDocument(); // popoverexpect(@@ -119,8 +120,8 @@ describe("DataStep", () => {).toBeInTheDocument(); // search input});- it("should render with a selected table", () => {- setup();+ it("should render with a selected table", async () => {+ await setup();expect(screen.getByText("Orders")).toBeInTheDocument();expect(getIcon("table")).toBeInTheDocument();@@ -136,7 +137,7 @@ describe("DataStep", () => {it.each<{ type: CardType; icon: IconName }>([{ type: "question", icon: "table2" },{ type: "model", icon: "model" },- ])("should render with a selected card", ({ type, icon }) => {+ ])("should render with a selected card", async ({ type, icon }) => {const card = createSavedStructuredCard({id: 1,type,@@ -153,14 +154,14 @@ describe("DataStep", () => {),);const step = createMockNotebookStep({ query });- setup({ step });+ await setup({ step });expect(screen.getByText(card.name)).toBeInTheDocument();expect(getIcon(icon)).toBeInTheDocument();});it("should change a table", async () => {- const { getNextTableName } = setup();+ const { getNextTableName } = await setup();await userEvent.click(screen.getByText("Orders"));await userEvent.click(await screen.findByText("Products"));@@ -170,7 +171,7 @@ describe("DataStep", () => {describe("fields selection", () => {it("should render with all columns selected", async () => {- setup();+ await setup();await userEvent.click(screen.getByLabelText("Pick columns"));expect(screen.getByLabelText("Select all")).toBeChecked();@@ -182,7 +183,7 @@ describe("DataStep", () => {it("should render with a single column selected", async () => {const query = createQueryWithFields(["ID"]);- setup({ step: createMockNotebookStep({ query }) });+ await setup({ step: createMockNotebookStep({ query }) });await userEvent.click(screen.getByLabelText("Pick columns"));expect(screen.getByLabelText("Select all")).not.toBeChecked();@@ -194,7 +195,7 @@ describe("DataStep", () => {it("should render with multiple columns selected", async () => {const query = createQueryWithFields(["ID", "TOTAL"]);- setup({ step: createMockNotebookStep({ query }) });+ await setup({ step: createMockNotebookStep({ query }) });await userEvent.click(screen.getByLabelText("Pick columns"));expect(screen.getByLabelText("Select all")).not.toBeChecked();@@ -209,7 +210,7 @@ describe("DataStep", () => {it("should allow selecting a column", async () => {const query = createQueryWithFields(["ID"]);const step = createMockNotebookStep({ query });- const { getNextColumn } = setup({ step });+ const { getNextColumn } = await setup({ step });await userEvent.click(screen.getByLabelText("Pick columns"));await userEvent.click(screen.getByLabelText("Tax"));@@ -220,7 +221,7 @@ describe("DataStep", () => {});it("should allow de-selecting a column", async () => {- const { getNextColumn } = setup();+ const { getNextColumn } = await setup();await userEvent.click(screen.getByLabelText("Pick columns"));await userEvent.click(screen.getByLabelText("Tax"));@@ -233,7 +234,7 @@ describe("DataStep", () => {it("should allow selecting all columns", async () => {const query = createQueryWithFields(["ID"]);const step = createMockNotebookStep({ query });- const { getNextColumn } = setup({ step });+ const { getNextColumn } = await setup({ step });await userEvent.click(screen.getByLabelText("Pick columns"));await userEvent.click(screen.getByLabelText("Select all"));@@ -244,7 +245,7 @@ describe("DataStep", () => {});it("should leave one column when de-selecting all columns", async () => {- const { getNextQuery } = setup();+ const { getNextQuery } = await setup();await userEvent.click(screen.getByLabelText("Pick columns"));await userEvent.click(screen.getByLabelText("Select all"));@@ -253,28 +254,28 @@ describe("DataStep", () => {expect(Lib.fields(nextQuery, 0)).toHaveLength(1);});- it("should not display fields picker in read-only mode", () => {- setup({ readOnly: true });+ it("should not display fields picker in read-only mode", async () => {+ await setup({ readOnly: true });expect(screen.queryByLabelText("Pick columns")).not.toBeInTheDocument();});- it("should not display fields picker until a table is selected", () => {- setupEmptyQuery();+ it("should not display fields picker until a table is selected", async () => {+ await setupEmptyQuery();expect(screen.queryByLabelText("Pick columns")).not.toBeInTheDocument();});- it("should not display fields picker if a query has aggregations", () => {+ it("should not display fields picker if a query has aggregations", async () => {const query = createQueryWithAggregation();const step = createMockNotebookStep({ query });- setup({ step });+ await setup({ step });expect(screen.queryByLabelText("Pick columns")).not.toBeInTheDocument();});- it("should not display fields picker if a query has breakouts", () => {+ it("should not display fields picker if a query has breakouts", async () => {const query = createQueryWithBreakout();const step = createMockNotebookStep({ query });- setup({ step });+ await setup({ step });expect(screen.queryByLabelText("Pick columns")).not.toBeInTheDocument();});@@ -282,7 +283,7 @@ describe("DataStep", () => {describe("link to data source", () => {it("should show the tooltip on hover", async () => {- setup();+ await setup();await userEvent.hover(screen.getByText("Orders"));expect(await screen.findByRole("tooltip")).toHaveTextContent(@@ -291,15 +292,15 @@ describe("DataStep", () => {});it("should show a search input when no data is selected", async () => {- setupEmptyQuery();+ await setupEmptyQuery();expect(await screen.findByPlaceholderText(/search for tables and more/i),).toBeInTheDocument();});- it("meta click should open the data source in a new window", () => {- const { mockWindowOpen } = setup();+ it("meta click should open the data source in a new window", async () => {+ const { mockWindowOpen } = await setup();const dataSource = screen.getByText("Orders");fireEvent.click(dataSource, { metaKey: true });@@ -308,8 +309,8 @@ describe("DataStep", () => {mockWindowOpen.mockClear();});- it("ctrl click should open the data source in a new window", () => {- const { mockWindowOpen } = setup();+ it("ctrl click should open the data source in a new window", async () => {+ const { mockWindowOpen } = await setup();const dataSource = screen.getByText("Orders");fireEvent.click(dataSource, { ctrlKey: true });@@ -318,8 +319,8 @@ describe("DataStep", () => {mockWindowOpen.mockClear();});- it("middle click should open the data source in a new window", () => {- const { mockWindowOpen } = setup();+ it("middle click should open the data source in a new window", async () => {+ const { mockWindowOpen } = await setup();const dataSource = screen.getByText("Orders");const middleClick = new MouseEvent("auxclick", {@@ -334,7 +335,7 @@ describe("DataStep", () => {});it("regular click should open the mini picker", async () => {- const { mockWindowOpen } = setup();+ const { mockWindowOpen } = await setup();const dataSource = screen.getByText("Orders");@@ -350,7 +351,7 @@ describe("DataStep", () => {const step = createMockNotebookStep({question: DEFAULT_QUESTION.setType("metric"),});- const { getNextQuery } = setup({ step });+ const { getNextQuery } = await setup({ step });await userEvent.click(screen.getByText("Orders"));await userEvent.click(await screen.findByText("Products"));@@ -368,7 +369,7 @@ describe("DataStep", () => {it("should not automatically aggregate by count for non-metrics", async () => {const step = createMockNotebookStep();- const { getNextQuery } = setup({ step });+ const { getNextQuery } = await setup({ step });await userEvent.click(screen.getByText("Orders"));await userEvent.click(await screen.findByText("Products"));diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsxindex b20ae70c1eb..f5e04b69817 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/enterprise.unit.spec.tsx@@ -1,11 +1,12 @@import userEvent from "@testing-library/user-event";import { fireEvent, screen } from "__support__/ui";+import { mockGetBoundingClientRect } from "__support__/utils";import { mockIsEmbeddingSdk } from "metabase/embedding-sdk/mocks/config-mock";import { type SetupOpts, setup as baseSetup } from "./setup";-function setup(opts: SetupOpts = {}) {+async function setup(opts: SetupOpts = {}) {return baseSetup({enterprisePlugins: ["embedding"],...opts,@@ -14,7 +15,8 @@ function setup(opts: SetupOpts = {}) {describe("DataStep", () => {const scrollBy = HTMLElement.prototype.scrollBy;- const getBoundingClientRect = HTMLElement.prototype.getBoundingClientRect;++ mockGetBoundingClientRect();beforeAll(() => {HTMLElement.prototype.scrollBy = jest.fn();@@ -35,7 +37,6 @@ describe("DataStep", () => {afterAll(() => {HTMLElement.prototype.scrollBy = scrollBy;- HTMLElement.prototype.getBoundingClientRect = getBoundingClientRect;jest.resetAllMocks();});@@ -47,7 +48,7 @@ describe("DataStep", () => {});it("should not show the tooltip", async () => {- setup({ isEmbeddingSdk: true });+ await setup({ isEmbeddingSdk: true });await userEvent.hover(await screen.findByText("Orders"));expect(screen.queryByRole("tooltip")).not.toBeInTheDocument();@@ -56,7 +57,7 @@ describe("DataStep", () => {it.each([{ metaKey: true }, { ctrlKey: true }])("meta/ctrl click should not open the data source",async (clickConfig) => {- const { mockWindowOpen } = setup({+ const { mockWindowOpen } = await setup({isEmbeddingSdk: true,});@@ -70,7 +71,7 @@ describe("DataStep", () => {);it("middle click should not open the data source", async () => {- const { mockWindowOpen } = setup({+ const { mockWindowOpen } = await setup({isEmbeddingSdk: true,});diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsxindex 455d823cdbc..d9af75b4de0 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx@@ -5,7 +5,7 @@ import {setupRecentViewsAndSelectionsEndpoints,setupSearchEndpoints,} from "__support__/server-mocks";-import { renderWithProviders } from "__support__/ui";+import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";import { createMockModelResult } from "metabase/browse/models/test-utils";import { ROOT_COLLECTION } from "metabase/collections/constants";import * as Lib from "metabase-lib";@@ -24,7 +24,7 @@ export interface SetupOpts {isEmbeddingSdk?: boolean;enterprisePlugins?: Parameters<typeof setupEnterpriseOnlyPlugin>[0][];}-export const setup = ({+export const setup = async ({step = createMockNotebookStep(),readOnly = false,isEmbeddingSdk = false,@@ -71,6 +71,8 @@ export const setup = ({</NotebookProvider>,);+ await waitForLoaderToBeRemoved();+const getNextQuery = (): Lib.Query => {const [lastCall] = updateQuery.mock.calls.slice(-1);return lastCall[0];diff --git a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsxindex d7407bdf373..6710fed332e 100644--- a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx@@ -1,6 +1,6 @@import userEvent from "@testing-library/user-event";-import { renderWithProviders, screen, within } from "__support__/ui";+import { act, renderWithProviders, screen, within } from "__support__/ui";import * as Lib from "metabase-lib";import { DEFAULT_TEST_QUERY, SAMPLE_PROVIDER } from "metabase-lib/test-helpers";import { ORDERS_ID } from "metabase-types/api/mocks/presets";@@ -53,7 +53,9 @@ describe("Notebook Editor > Expression Step", () => {const input = screen.getByTestId("custom-expression-query-editor");await userEvent.type(input, "1 + 1");- input.blur();+ await act(async () => {+ input.blur();+ });await userEvent.type(screen.getByTestId("expression-name"),@@ -151,7 +153,9 @@ describe("Notebook Editor > Expression Step", () => {const input = screen.getByTestId("custom-expression-query-editor");await userEvent.type(input, "1 + 1");- input.blur();+ await act(async () => {+ input.blur();+ });await userEvent.type(screen.getByTestId("expression-name"), "Total{enter}");const recentQuery = getRecentQuery();diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsxindex 38db04438cc..27b6cbb3c9a 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinStep.unit.spec.tsx@@ -1,4 +1,4 @@-import userEvent from "@testing-library/user-event";+import _userEvent from "@testing-library/user-event";import { useState } from "react";import { createMockMetadata } from "__support__/metadata";@@ -82,6 +82,8 @@ const metadata = createMockMetadata({const provider = createMetadataProvider({ metadata });+const userEvent = _userEvent.setup();+function getJoinedQuery() {return Lib.createTestQuery(provider, {stages: [@@ -286,7 +288,10 @@ describe("Notebook Editor > Join Step", () => {});afterAll(() => {- jest.resetAllMocks();+ // restore (not reset): resetAllMocks would leave the spied+ // `getBoundingClientRect` returning `undefined`, which crashes+ // floating-ui callbacks that fire after the tests finish.+ jest.restoreAllMocks();});it("should display a join correctly", () => {diff --git a/frontend/test/__support__/utils.ts b/frontend/test/__support__/utils.tsindex 109f56072c2..6169b1e1f08 100644--- a/frontend/test/__support__/utils.ts+++ b/frontend/test/__support__/utils.ts@@ -18,6 +18,18 @@ export async function delay(duration: number) {});}+/**+ * Flushes pending microtasks/timers inside `act` so async effects (notably+ * floating-ui's `computePosition().then(flushSync(setState))` triggered by+ * Mantine popovers) settle before assertions. Use after opening a popover+ * to avoid the "not wrapped in act" warning.+ */+export async function waitForFloatingPosition() {+ await act(async () => {+ await Promise.resolve();+ });+}+const DEFAULT_BOUNDING_CLIENT_RECT: DOMRect = {height: 1,width: 1,diff --git a/src/metabase/lib/join.cljc b/src/metabase/lib/join.cljcindex 45489c9d61c..bfcbd916342 100644--- a/src/metabase/lib/join.cljc+++ b/src/metabase/lib/join.cljc@@ -1045,7 +1045,13 @@(case j-fields:all (map #(assoc % :selected? true))(:none nil) (map #(assoc % :selected? false))- (mapcat #(lib.equality/mark-selected-columns [%] j-fields)))))+ ;; Per-column check against `j-fields` avoids the spurious+ ;; "N refs are selected, but we found 1 matches" warning that+ ;; `mark-selected-columns` emits when given a single column and many refs.+ (map (fn [col]+ (assoc col :selected?+ (boolean (some #(lib.equality/find-matching-column nil -1 % [col])+ j-fields))))))))(def ^:private xform-fix-source-for-joinable-columns(map #(assoc % :lib/source :source/joins)))