vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-11 12:30:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10727 from NoHomey/patch-16

Browse Source 
Fixing broken tests due to object-assign type definition change
This commit is contained in:
Ron Buckton
2016-08-26 10:26:40 -07:00
committed by GitHub
parent 0b12cf283a 52a9758e65
commit a6967c763a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
react-redux/react-redux-2.1.2-tests.tsx
+2 -2
View File
@@ -233,8 +233,8 @@ connect(mapStateToProps3)(TodoApp);
// return { todos: state.todos };
//}
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState {
return objectAssign({}, ownProps, {
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
return objectAssign({}, ownProps, dispatchProps, {
todos: stateProps.todos[ownProps.userId],
addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
});
react-redux/react-redux-tests.tsx
+2 -2
View File
@@ -268,8 +268,8 @@ connect(mapStateToProps3)(TodoApp);
// return { todos: state.todos };
//}
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState {
return objectAssign({}, ownProps, {
function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
return objectAssign({}, ownProps, dispatchProps, {
todos: stateProps.todos[ownProps.userId],
addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
});