Skip to content

Commit

Permalink
Messages_prop_is_corrected (#151)
Browse files Browse the repository at this point in the history
* Messages prop is corrected

* Add explicit test for passing messages
  • Loading branch information
MaksimDrobchak authored and stepovat committed May 16, 2019
1 parent 1148417 commit 139cc3b
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/components/with_search.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const withSearch = WrappedComponent => ({
}) => {
const SearchRenderer = searchRenderer;
return (
<WrappedComponent {...others}>
<WrappedComponent {...others} messages={messages}>
{showSearch && (
<SearchRenderer
onChange={filterItems}
Expand Down
16 changes: 14 additions & 2 deletions tests/components/__snapshots__/destination_list.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ exports[`DestinationList Case disabled search with destination list 1`] = `
height={400}
itemHeight={40}
listRenderer={[Function]}
messages={Object {}}
messages={
Object {
"messages": Object {
"searchPlaceholder": "Search",
},
}
}
noItemsRenderer={[Function]}
selectedIds={Array []}
selectedItemRenderer={[Function]}
Expand All @@ -21,7 +27,13 @@ exports[`DestinationList Case include search with destination list 1`] = `
height={400}
itemHeight={40}
listRenderer={[Function]}
messages={Object {}}
messages={
Object {
"messages": Object {
"searchPlaceholder": "Search",
},
}
}
noItemsRenderer={[Function]}
selectedIds={Array []}
selectedItemRenderer={[Function]}
Expand Down
9 changes: 8 additions & 1 deletion tests/components/__snapshots__/multi_select.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4530,7 +4530,14 @@ Object {
"itemHeight": 40,
"itemRenderer": [Function],
"listRenderer": [Function],
"messages": Object {},
"messages": Object {
"clearAllMessage": "Uncheck all",
"noItemsMessage": "No entries available...",
"noneSelectedMessage": "Nothing",
"searchPlaceholder": "Find...",
"selectAllMessage": "Check all",
"selectedMessage": "Checked",
},
"noItemsRenderer": [Function],
"selectAllHeight": undefined,
"selectAllItems": undefined,
Expand Down
11 changes: 10 additions & 1 deletion tests/components/__snapshots__/source_list.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,16 @@ exports[`SourceList passed source_list wrapped up to HOC withSearch 1`] = `
itemHeight={10}
itemRenderer={[MockFunction mockedComponent]}
listRenderer={[Function]}
messages={Object {}}
messages={
Object {
"clearAllMessage": "Uncheck all",
"noItemsMessage": "No entries available...",
"noneSelectedMessage": "Nothing",
"searchPlaceholder": "Find...",
"selectAllMessage": "Check all",
"selectedMessage": "Checked",
}
}
noItemsRenderer={[Function]}
selectAllHeight={60}
selectAllItems={[MockFunction selectAllItems]}
Expand Down
20 changes: 19 additions & 1 deletion tests/components/__snapshots__/with_search.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ exports[`With search Case custom search component 1`] = `
},
]
}
messages={
Object {
"searchPlaceholder": "Search",
}
}
>
<UserSearch
onChange={[MockFunction]}
Expand All @@ -35,6 +40,11 @@ exports[`With search Case default search component 1`] = `
},
]
}
messages={
Object {
"searchPlaceholder": "Search",
}
}
>
<Search
onChange={[MockFunction]}
Expand All @@ -50,4 +60,12 @@ exports[`With search Case default search component 1`] = `
</CustomComponent>
`;

exports[`With search Case not search component 1`] = `<CustomComponent />`;
exports[`With search Case not search component 1`] = `
<CustomComponent
messages={
Object {
"searchPlaceholder": "Search",
}
}
/>
`;
17 changes: 17 additions & 0 deletions tests/components/with_search.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import { mount } from "enzyme";
import ShallowRenderer from "react-test-renderer/shallow";
import withSearch from "../../src/components/with_search.js";

Expand Down Expand Up @@ -60,4 +61,20 @@ describe("With search", () => {
);
expect(component).toMatchSnapshot();
});

test("Case messages are passed ok", () => {
const filterItems = jest.fn();
const component = mount(
<ListComponent
showSearch={false}
searchRenderer={UserSearch}
searchIcon={<img src="custom_icon" alt="" />}
searchValue="11"
messages={messages}
filterItems={filterItems}
/>
);
const listComponent = component.find(ListComponent);
expect(listComponent.props().messages).toEqual(messages);
});
});

0 comments on commit 139cc3b

Please sign in to comment.