From b6698a5307aebd8e5b62e4d2888a624c573b0f3c Mon Sep 17 00:00:00 2001 From: Chun-MingChen Date: Sat, 7 Oct 2017 23:35:27 +0800 Subject: [PATCH] add resolved props factory to generator mock props for body and header --- .../react-bootstrap-table2/test/body.test.js | 4 ++- .../test/factory/index.js | 6 ++++ .../test/factory/resolved-props.js | 36 +++++++++++++++++++ .../test/header.test.js | 3 +- .../test/mock-data/body-resolved-props.js | 16 --------- .../test/mock-data/header-resolved-props.js | 11 ------ .../react-bootstrap-table2/test/row.test.js | 3 +- 7 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 packages/react-bootstrap-table2/test/factory/index.js create mode 100644 packages/react-bootstrap-table2/test/factory/resolved-props.js delete mode 100644 packages/react-bootstrap-table2/test/mock-data/body-resolved-props.js delete mode 100644 packages/react-bootstrap-table2/test/mock-data/header-resolved-props.js diff --git a/packages/react-bootstrap-table2/test/body.test.js b/packages/react-bootstrap-table2/test/body.test.js index 4c92789..554641c 100644 --- a/packages/react-bootstrap-table2/test/body.test.js +++ b/packages/react-bootstrap-table2/test/body.test.js @@ -6,7 +6,9 @@ import Body from 'src/body'; import Row from 'src/row'; import Const from 'src/const'; import RowSection from 'src/row-section'; -import mockBodyResolvedProps from 'test/mock-data/body-resolved-props'; +import { bodyResolvedProps } from 'test/factory'; + +const mockBodyResolvedProps = bodyResolvedProps(); describe('Body', () => { let wrapper; diff --git a/packages/react-bootstrap-table2/test/factory/index.js b/packages/react-bootstrap-table2/test/factory/index.js new file mode 100644 index 0000000..b48fc22 --- /dev/null +++ b/packages/react-bootstrap-table2/test/factory/index.js @@ -0,0 +1,6 @@ +import { bodyResolvedProps, headerResolvedProps } from './resolved-props'; + +export { + bodyResolvedProps, + headerResolvedProps +}; diff --git a/packages/react-bootstrap-table2/test/factory/resolved-props.js b/packages/react-bootstrap-table2/test/factory/resolved-props.js new file mode 100644 index 0000000..bfdbadd --- /dev/null +++ b/packages/react-bootstrap-table2/test/factory/resolved-props.js @@ -0,0 +1,36 @@ +import BootstrapTable from 'src/bootstrap-table'; + +const columns = [{ + dataField: 'id', + text: 'ID' +}, { + dataField: 'name', + text: 'Name' +}]; + +const data = [{ + id: 1, + name: 'A' +}, { + id: 2, + name: 'B' +}]; + +const keyField = 'id'; + +const props = { + columns, + data, + keyField +}; + +const bootstrapTable = new BootstrapTable(props); + +export const bodyResolvedProps = () => ({ + cellEdit: bootstrapTable.resolveCellEditProps(), + selectRow: bootstrapTable.resolveCellSelectionProps() +}); + +export const headerResolvedProps = () => ({ + selectRow: bootstrapTable.resolveHeaderCellSelectionProps() +}); diff --git a/packages/react-bootstrap-table2/test/header.test.js b/packages/react-bootstrap-table2/test/header.test.js index f48ccbf..e751209 100644 --- a/packages/react-bootstrap-table2/test/header.test.js +++ b/packages/react-bootstrap-table2/test/header.test.js @@ -5,8 +5,9 @@ import HeaderCell from 'src/header-cell'; import SelectionHeaderCell from 'src/row-selection/selection-header-cell'; import Header from 'src/header'; import Const from 'src/const'; +import { headerResolvedProps } from 'test/factory'; -import mockHeaderResolvedProps from 'test/mock-data/header-resolved-props'; +const mockHeaderResolvedProps = headerResolvedProps(); describe('Header', () => { let wrapper; diff --git a/packages/react-bootstrap-table2/test/mock-data/body-resolved-props.js b/packages/react-bootstrap-table2/test/mock-data/body-resolved-props.js deleted file mode 100644 index efd8eab..0000000 --- a/packages/react-bootstrap-table2/test/mock-data/body-resolved-props.js +++ /dev/null @@ -1,16 +0,0 @@ -import Const from 'src/const'; - -const { ROW_SELECT_DISABLED, UNABLE_TO_CELL_EDIT } = Const; - -export const cellSelectionResolvedProps = { - mode: ROW_SELECT_DISABLED -}; - -export const cellEditResolvedProps = { - mode: UNABLE_TO_CELL_EDIT -}; - -export default { - cellEdit: cellEditResolvedProps, - selectRow: cellSelectionResolvedProps -}; diff --git a/packages/react-bootstrap-table2/test/mock-data/header-resolved-props.js b/packages/react-bootstrap-table2/test/mock-data/header-resolved-props.js deleted file mode 100644 index a51fc96..0000000 --- a/packages/react-bootstrap-table2/test/mock-data/header-resolved-props.js +++ /dev/null @@ -1,11 +0,0 @@ -import Const from 'src/const'; - -const { ROW_SELECT_DISABLED } = Const; - -export const headerCellSelectionResolvedProps = { - mode: ROW_SELECT_DISABLED -}; - -export default { - selectRow: headerCellSelectionResolvedProps -}; diff --git a/packages/react-bootstrap-table2/test/row.test.js b/packages/react-bootstrap-table2/test/row.test.js index ed891f9..7eec0f0 100644 --- a/packages/react-bootstrap-table2/test/row.test.js +++ b/packages/react-bootstrap-table2/test/row.test.js @@ -7,8 +7,9 @@ import Row from 'src/row'; import Const from 'src/const'; import EditingCell from 'src/editing-cell'; import SelectionCell from 'src/row-selection/selection-cell'; +import { bodyResolvedProps } from 'test/factory'; -import mockBodyResolvedProps from 'test/mock-data/body-resolved-props'; +const mockBodyResolvedProps = bodyResolvedProps(); const defaultColumns = [{ dataField: 'id',