From 296ddbd8d4042198dc3f29817a048d30e506464f Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Wed, 21 Nov 2018 11:01:19 +0100 Subject: [PATCH] Update data-table tests to match new filters structure Feature #14258 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/components/data-table/data-table.test.tsx | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/components/data-table/data-table.test.tsx b/src/components/data-table/data-table.test.tsx index c2f5d4ac..d0b83b96 100644 --- a/src/components/data-table/data-table.test.tsx +++ b/src/components/data-table/data-table.test.tsx @@ -4,12 +4,15 @@ import * as React from "react"; import { mount, configure } from "enzyme"; +import { pipe } from 'lodash/fp'; import { TableHead, TableCell, Typography, TableBody, Button, TableSortLabel } from "@material-ui/core"; import * as Adapter from "enzyme-adapter-react-16"; import { DataTable, DataColumns } from "./data-table"; -import { DataTableFilters } from "../data-table-filters/data-table-filters"; +import { DataTableFilters } from "~/components/data-table-filters/data-table-filters"; import { SortDirection, createDataColumn } from "./data-column"; -import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view'; +import { DataTableFiltersPopover } from '~/components/data-table-filters/data-table-filters-popover'; +import { createTree, setNode, initTreeNode } from '~/models/tree'; +import { DataTableFilterItem } from "~/components/data-table-filters/data-table-filters-tree"; configure({ adapter: new Adapter() }); @@ -139,12 +142,12 @@ describe("", () => { it("passes sorting props to ", () => { const columns: DataColumns = [ createDataColumn({ - name: "Column 1", - sortDirection: SortDirection.ASC, - selected: true, - configurable: true, - render: (item) => {item} - })]; + name: "Column 1", + sortDirection: SortDirection.ASC, + selected: true, + configurable: true, + render: (item) => {item} + })]; const onSortToggle = jest.fn(); const dataTable = mount(", () => { expect(dataTable.find(DataTableFilters)).toHaveLength(0); }); - it("passes filter props to ", () => { + it("passes filter props to ", () => { + const filters = pipe( + () => createTree(), + setNode(initTreeNode({ id: 'filter', value: { name: 'filter' } })) + ); const columns: DataColumns = [{ name: "Column 1", sortDirection: SortDirection.ASC, selected: true, configurable: true, - filters: [{ name: "Filter 1", selected: true }], + filters: filters(), render: (item) => {item} }]; const onFiltersChange = jest.fn(); @@ -198,8 +205,8 @@ describe("", () => { onRowDoubleClick={jest.fn()} onSortToggle={jest.fn()} onContextMenu={jest.fn()} />); - expect(dataTable.find(DataTableFilters).prop("filters")).toBe(columns[0].filters); - dataTable.find(DataTableFilters).prop("onChange")([]); + expect(dataTable.find(DataTableFiltersPopover).prop("filters")).toBe(columns[0].filters); + dataTable.find(DataTableFiltersPopover).prop("onChange")([]); expect(onFiltersChange).toHaveBeenCalledWith([], columns[0]); }); -- 2.30.2