From 29feeeb7682c99b908e4907c6dcd2bca5c8fd47c Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Thu, 15 Dec 2022 12:06:09 -0500 Subject: [PATCH] Fleet UI: Rebase fix (#9040) --- .../EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tests.tsx | 2 +- frontend/components/LastUpdatedText/LastUpdatedText.tests.tsx | 2 +- .../DataTable/DropdownCell/DropdownCell.tests.tsx | 2 +- .../TableContainer/DataTable/LinkCell/LinkCell.tests.tsx | 2 +- .../TableContainer/DataTable/PillCell/PillCell.tests.tsx | 2 +- frontend/components/buttons/RevealButton/RevealButton.tests.tsx | 2 +- frontend/pages/admin/IntegrationsPage/cards/Mdm/index.ts | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 frontend/pages/admin/IntegrationsPage/cards/Mdm/index.ts diff --git a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tests.tsx b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tests.tsx index 5ebe281636..83e9d3e6fe 100644 --- a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tests.tsx +++ b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import EnrollSecretRow from "./EnrollSecretRow"; diff --git a/frontend/components/LastUpdatedText/LastUpdatedText.tests.tsx b/frontend/components/LastUpdatedText/LastUpdatedText.tests.tsx index 933c225760..438e42daea 100644 --- a/frontend/components/LastUpdatedText/LastUpdatedText.tests.tsx +++ b/frontend/components/LastUpdatedText/LastUpdatedText.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { render, screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import LastUpdatedText from "./LastUpdatedText"; diff --git a/frontend/components/TableContainer/DataTable/DropdownCell/DropdownCell.tests.tsx b/frontend/components/TableContainer/DataTable/DropdownCell/DropdownCell.tests.tsx index 42591b0e0f..8c0c988525 100644 --- a/frontend/components/TableContainer/DataTable/DropdownCell/DropdownCell.tests.tsx +++ b/frontend/components/TableContainer/DataTable/DropdownCell/DropdownCell.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import DropdownCell from "./DropdownCell"; diff --git a/frontend/components/TableContainer/DataTable/LinkCell/LinkCell.tests.tsx b/frontend/components/TableContainer/DataTable/LinkCell/LinkCell.tests.tsx index f109f04613..64e578e41d 100644 --- a/frontend/components/TableContainer/DataTable/LinkCell/LinkCell.tests.tsx +++ b/frontend/components/TableContainer/DataTable/LinkCell/LinkCell.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import PATHS from "router/paths"; import LinkCell from "./LinkCell"; diff --git a/frontend/components/TableContainer/DataTable/PillCell/PillCell.tests.tsx b/frontend/components/TableContainer/DataTable/PillCell/PillCell.tests.tsx index 7e14065e73..da2c39d855 100644 --- a/frontend/components/TableContainer/DataTable/PillCell/PillCell.tests.tsx +++ b/frontend/components/TableContainer/DataTable/PillCell/PillCell.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import PillCell from "./PillCell"; diff --git a/frontend/components/buttons/RevealButton/RevealButton.tests.tsx b/frontend/components/buttons/RevealButton/RevealButton.tests.tsx index 1c1fb242be..b47ead2711 100644 --- a/frontend/components/buttons/RevealButton/RevealButton.tests.tsx +++ b/frontend/components/buttons/RevealButton/RevealButton.tests.tsx @@ -1,6 +1,6 @@ import React from "react"; import { render, screen } from "@testing-library/react"; -import { renderWithSetup } from "test/testingUtils"; +import { renderWithSetup } from "test/test-utils"; import RevealButton from "./RevealButton"; diff --git a/frontend/pages/admin/IntegrationsPage/cards/Mdm/index.ts b/frontend/pages/admin/IntegrationsPage/cards/Mdm/index.ts deleted file mode 100644 index b698635ae9..0000000000 --- a/frontend/pages/admin/IntegrationsPage/cards/Mdm/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./Mdm";