Fix ProjectFetcherHOC tests

Author: Ray Schamp

src/lib/project-fetcher-hoc.jsx

@@ -126,9 +126,13 @@ const ProjectFetcherHOC = function (WrappedComponent) {
             dispatch(onFetchedProjectData(projectData, loadingState)),
         setProjectId: projectId => dispatch(setProjectId(projectId))
     });
+    const mergeProps = (stateProps, dispatchProps, ownProps) => Object.assign(
+        {}, stateProps, dispatchProps, ownProps
+    );
     return injectIntl(connect(
         mapStateToProps,
-        mapDispatchToProps
+        mapDispatchToProps,
+        mergeProps
     )(ProjectFetcherComponent));
 };
 

test/unit/util/project-fetcher-hoc.test.jsx

@@ -1,8 +1,11 @@
 import React from 'react';
 import configureStore from 'redux-mock-store';
+
+import {mountWithIntl} from '../../helpers/intl-helpers.jsx';
+
 import ProjectFetcherHOC from '../../../src/lib/project-fetcher-hoc.jsx';
 import storage from '../../../src/lib/storage';
-import {mountWithIntl} from '../../helpers/intl-helpers.jsx';
+import {LoadingState} from '../../../src/reducers/project-state';
 
 jest.mock('react-ga');
 
@@ -11,36 +14,41 @@ describe('ProjectFetcherHOC', () => {
     let store;
 
     beforeEach(() => {
-        store = mockStore({scratchGui: {}});
+        store = mockStore({
+            scratchGui: {
+                projectState: {}
+            }
+        });
     });
 
-    test('when there is an id, it tries to load that project', () => {
-        const Component = ({projectData}) => <div>{projectData}</div>;
+    test('when there is an id, it tries to update the store with that id', () => {
+        const Component = ({projectId}) => <div>{projectId}</div>;
         const WrappedComponent = ProjectFetcherHOC(Component);
-        const originalLoad = storage.load;
-        storage.load = jest.fn((type, id) => Promise.resolve({data: id}));
-        const mounted = mountWithIntl(
+        const mockSetProjectIdFunc = jest.fn();
+        mountWithIntl(
             <WrappedComponent
                 projectId="100"
+                setProjectId={mockSetProjectIdFunc}
                 store={store}
             />
         );
-        expect(mounted.props().projectId).toEqual('100');
-        expect(storage.load).toHaveBeenLastCalledWith(
-            storage.AssetType.Project, '100', storage.DataFormat.JSON
-        );
-        storage.load = originalLoad;
+        expect(mockSetProjectIdFunc.mock.calls[0][0]).toBe('100');
     });
-
-    test('when there is no project data, it renders null', () => {
-        const Component = ({projectData}) => <div>{projectData}</div>;
-        const WrappedComponent = ProjectFetcherHOC(Component);
+    test('when there is a reduxProjectId and isFetchingWithProjectId is true, it loads the project', () => {
         const originalLoad = storage.load;
-        storage.load = jest.fn(() => Promise.resolve(null));
+        storage.load = jest.fn((type, id) => Promise.resolve({data: id}));
+        const Component = ({projectId}) => <div>{projectId}</div>;
+        const WrappedComponent = ProjectFetcherHOC(Component);
         const mounted = mountWithIntl(<WrappedComponent store={store} />);
+        mounted.setProps({
+            reduxProjectId: '100',
+            isFetchingWithId: true,
+            loadingState: LoadingState.FETCHING_WITH_ID
+        });
+        mounted.update();
+        expect(storage.load).toHaveBeenLastCalledWith(
+            storage.AssetType.Project, '100', storage.DataFormat.JSON
+        );
         storage.load = originalLoad;
-        const mountedDiv = mounted.find('div');
-        expect(mountedDiv.exists()).toEqual(false);
     });
-
 });