Eliminate yarn test spam

components/profile_popover/index.js

@@ -8,13 +8,11 @@ import ProfilePopover from './profile_popover.jsx';
 function mapStateToProps(state, ownProps) {
  const config = state.entities.general.config;
 
- const showEmailAddress = config.ShowEmailAddress === 'true';
  const enableWebrtc = config.EnableWebrtc === 'true';
  const enableTimezone = config.ExperimentalTimezone === 'true';
 
  return {
  ...ownProps,
- showEmailAddress,
  enableWebrtc,
  enableTimezone,
  };

components/profile_popover/profile_popover.jsx

@@ -201,6 +201,7 @@ class ProfilePopover extends React.Component {
  delete popoverProps.hasMention;
  delete popoverProps.dispatch;
  delete popoverProps.enableWebrtc;
+ delete popoverProps.enableTimezone;
 
  let webrtc;
  const userMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
@@ -283,7 +284,10 @@ class ProfilePopover extends React.Component {
  }
 
  dataContent.push(
- <hr className='divider divider--expanded'/>
+ <hr
+ key='user-popover-hr'
+ className='divider divider--expanded'
+ />
  );
 
  if (this.props.user.position) {

components/sidebar/sidebar.jsx

@@ -76,12 +76,12 @@ export default class Sidebar extends React.PureComponent {
  /**
  * Current team object
  */
- currentTeam: PropTypes.object.isRequired,
+ currentTeam: PropTypes.object,
 
  /**
  * Current user object
  */
- currentUser: PropTypes.object.isRequired,
+ currentUser: PropTypes.object,
 
  /**
  * Number of unread mentions/messages

package.json

@@ -89,6 +89,7 @@
  "image-webpack-loader": "3.6.0",
  "imports-loader": "0.7.1",
  "jest": "22.1.4",
+ "jest-canvas-mock": "1.0.2",
  "jest-cli": "22.1.4",
  "jquery-deferred": "0.3.1",
  "json-loader": "0.5.7",
@@ -142,6 +143,7 @@
  "transformIgnorePatterns": [
  "node_modules/(?!react-native|react-router)"
  ],
+ "setupFiles": ["jest-canvas-mock"],
  "setupTestFrameworkScriptFile": "<rootDir>/tests/setup.js",
  "testURL": "http:https://localhost:8065"
  },

store/index.js

@@ -14,6 +14,7 @@ import {storageRehydrate} from 'actions/storage';
 import appReducer from 'reducers';
 import {transformSet} from 'store/utils';
 import {detect} from 'utils/network.js';
+import {ActionTypes} from 'utils/constants.jsx';
 
 function getAppReducer() {
  return require('../reducers'); // eslint-disable-line global-require
@@ -73,7 +74,7 @@ export default function configureStore(initialState) {
  const storage = localforage;
  const KEY_PREFIX = 'reduxPersist:';
 
- localforage.ready(() => {
+ localforage.ready().then(() => {
  const persistor = persistStore(store, {storage, keyPrefix: KEY_PREFIX, ...options}, () => {
  store.dispatch({
  type: General.STORE_REHYDRATION_COMPLETE,
@@ -135,6 +136,11 @@ export default function configureStore(initialState) {
  });
  }
  });
+ }).catch((error) => {
+ store.dispatch({
+ type: ActionTypes.STORE_REHYDRATION_FAILED,
+ error,
+ });
  });
  },
  persistOptions: {

tests/components/__snapshots__/channel_notifications_modal.test.jsx.snap

@@ -68,6 +68,7 @@ exports[`components/channel_notifications_modal/ChannelNotificationsModal should
  />
  <NotificationSection
  expand={false}
+ memberNotificationLevel="all"
  onChange={[Function]}
  onSubmit={[Function]}
  onUpdateSection={[Function]}

tests/components/__snapshots__/delete_post_modal.test.jsx.snap

@@ -21,7 +21,7 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
  "remove": [Function],
  }
  }
- onExited={[Function]}
+ onExited={[MockFunction]}
  onHide={[Function]}
  renderBackdrop={[Function]}
  restoreFocus={true}
@@ -122,7 +122,7 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
  "remove": [Function],
  }
  }
- onExited={[Function]}
+ onExited={[MockFunction]}
  onHide={[Function]}
  renderBackdrop={[Function]}
  restoreFocus={true}
@@ -209,4 +209,4 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
  </button>
  </ModalFooter>
 </Modal>
-`;
+`;

tests/components/analytics/doughnut_chart.test.jsx

@@ -31,7 +31,7 @@ describe('components/analytics/doughnut_chart.jsx', () => {
  />
  );
 
- expect(Chart).toBeCalledWith(null, {data, options: {}, type: 'doughnut'});
+ expect(Chart).toBeCalledWith(expect.anything(), {data, options: {}, type: 'doughnut'});
  expect(wrapper).toMatchSnapshot();
  });
 
@@ -51,7 +51,7 @@ describe('components/analytics/doughnut_chart.jsx', () => {
  data={data}
  />
  );
- expect(Chart).toBeCalledWith(null, {data, options: {}, type: 'doughnut'});
+ expect(Chart).toBeCalledWith(expect.anything(), {data, options: {}, type: 'doughnut'});
  expect(wrapper).toMatchSnapshot();
  });
 

tests/components/channel_notifications_modal.test.jsx

@@ -10,8 +10,18 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  show: true,
  onHide: () => {}, //eslint-disable-line no-empty-function
  channel: {id: 'channel_id', display_name: 'channel_display_name'},
- channelMember: {notify_props: {desktop: NotificationLevels.ALL}},
- currentUser: {id: 'current_user_id', notify_props: {desktop: NotificationLevels.ALL}},
+ channelMember: {
+ notify_props: {
+ desktop: NotificationLevels.ALL,
+ mark_unread: NotificationLevels.ALL,
+ },
+ },
+ currentUser: {
+ id: 'current_user_id',
+ notify_props: {
+ desktop: NotificationLevels.ALL,
+ },
+ },
  sendPushNotifications: true,
  actions: {
  updateChannelNotifyProps: () => {}, //eslint-disable-line no-empty-function
@@ -99,7 +109,12 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleSubmitMarkUnreadLevel', () => {
- const channelMember = {notify_props: {mark_unread: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.ALL,
+ },
+ };
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>
@@ -120,7 +135,12 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleUpdateMarkUnreadLevel', () => {
- const channelMember = {notify_props: {mark_unread: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.ALL,
+ },
+ };
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>
@@ -132,7 +152,12 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleUpdateMarkUnreadSection', () => {
- const channelMember = {notify_props: {mark_unread: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.ALL,
+ },
+ };
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>
@@ -154,7 +179,13 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleSubmitPushNotificationLevel', () => {
- const channelMember = {notify_props: {push: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.NONE,
+ push: NotificationLevels.ALL,
+ },
+ };
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>
@@ -175,7 +206,13 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleUpdatePushNotificationLevel', () => {
- const channelMember = {notify_props: {push: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.NONE,
+ push: NotificationLevels.ALL,
+ },
+ };
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>
@@ -187,7 +224,14 @@ describe('components/channel_notifications_modal/ChannelNotificationsModal', ()
  });
 
  test('should match state on handleUpdatePushSection', () => {
- const channelMember = {notify_props: {push: NotificationLevels.ALL}};
+ const channelMember = {
+ notify_props: {
+ desktop: NotificationLevels.NONE,
+ mark_unread: NotificationLevels.NONE,
+ push: NotificationLevels.ALL,
+ },
+ };
+
  const props = {...baseProps, channelMember};
  const wrapper = shallow(
  <ChannelNotificationsModal {...props}/>

tests/components/create_comment/create_comment.test.jsx

@@ -18,6 +18,7 @@ describe('components/CreateComment', () => {
  const baseProps = {
  channelId,
  rootId,
+ rootDeleted: false,
  channelMembersCount: 3,
  draft: {
  message: 'Test message',

tests/components/delete_post_modal.test.jsx

@@ -10,8 +10,6 @@ import {browserHistory} from 'utils/browser_history';
 import DeletePostModal from 'components/delete_post_modal/delete_post_modal.jsx';
 
 describe('components/delete_post_modal', () => {
- function emptyFunction() {} //eslint-disable-line no-empty-function
-
  const post = {
  id: '123',
  message: 'test',
@@ -23,9 +21,10 @@ describe('components/delete_post_modal', () => {
  commentCount: 0,
  isRHS: false,
  actions: {
- deletePost: emptyFunction,
+ deletePost: jest.fn(),
+ deleteAndRemovePost: jest.fn(),
  },
- onHide: emptyFunction,
+ onHide: jest.fn(),
  };
 
  test('should match snapshot for delete_post_modal with 0 comments', () => {
@@ -56,26 +55,36 @@ describe('components/delete_post_modal', () => {
 
  test('should have called actions.deleteAndRemovePost when handleDelete is called', async () => {
  browserHistory.push = jest.fn();
- const actions = {deleteAndRemovePost: jest.fn()};
- actions.deleteAndRemovePost.mockReturnValueOnce({data: true});
- const props = {...baseProps, actions};
+ const deleteAndRemovePost = jest.fn().mockReturnValueOnce({data: true});
+ const props = {
+ ...baseProps,
+ actions: {
+ deleteAndRemovePost,
+ },
+ };
  const wrapper = shallow(
  <DeletePostModal {...props}/>
  );
 
  wrapper.setState({show: true});
  wrapper.instance().handleDelete();
 
- await expect(actions.deleteAndRemovePost).toHaveBeenCalledTimes(1);
- expect(actions.deleteAndRemovePost).toHaveBeenCalledWith(props.post);
+ await expect(deleteAndRemovePost).toHaveBeenCalledTimes(1);
+ expect(deleteAndRemovePost).toHaveBeenCalledWith(props.post);
  expect(wrapper.state('show')).toEqual(false);
  });
 
  test('should call browserHistory.push on handleDelete with post.id === focusedPostId && channelName', async () => {
  browserHistory.push = jest.fn();
- const actions = {deleteAndRemovePost: jest.fn()};
- actions.deleteAndRemovePost.mockReturnValueOnce({data: true});
- const props = {...baseProps, actions, focusedPostId: '123', channelName: 'channel_name', teamName: 'team_name'};
+ const props = {
+ ...baseProps,
+ focusedPostId: '123',
+ channelName: 'channel_name',
+ teamName: 'team_name',
+ actions: {
+ deleteAndRemovePost: jest.fn().mockReturnValueOnce({data: true}),
+ },
+ };
  const wrapper = shallow(
  <DeletePostModal {...props}/>
  );

tests/components/dot_menu/dot_menu_empty.test.jsx

@@ -32,6 +32,7 @@ describe('components/dot_menu/DotMenu returning empty ("")', () => {
  setEditingPost: jest.fn(),
  pinPost: jest.fn(),
  unpinPost: jest.fn(),
+ openModal: jest.fn(),
  },
  };
 
@@ -52,6 +53,7 @@ describe('components/dot_menu/DotMenu returning empty ("")', () => {
  setEditingPost: jest.fn(),
  pinPost: jest.fn(),
  unpinPost: jest.fn(),
+ openModal: jest.fn(),
  },
  };
 
@@ -72,6 +74,7 @@ describe('components/dot_menu/DotMenu returning empty ("")', () => {
  setEditingPost: jest.fn(),
  pinPost: jest.fn(),
  unpinPost: jest.fn(),
+ openModal: jest.fn(),
  },
  };
 

tests/components/dot_menu/dot_menu_mobile.test.jsx

@@ -32,6 +32,7 @@ describe('components/dot_menu/DotMenu on mobile view', () => {
  setEditingPost: jest.fn(),
  pinPost: jest.fn(),
  unpinPost: jest.fn(),
+ openModal: jest.fn(),
  },
  };
 

tests/components/navbar/navbar.test.jsx

@@ -12,6 +12,11 @@ describe('components/navbar/Navbar', () => {
  isPinnedPosts: true,
  actions: {
  showEditChannelHeaderModal: jest.fn(),
+ toggleLhs: jest.fn(),
+ closeLhs: jest.fn(),
+ closeRhs: jest.fn(),
+ toggleRhsMenu: jest.fn(),
+ closeRhsMenu: jest.fn(),
  },
  isLicensed: true,
  enableWebrtc: true,

tests/components/sidebar/sidebar.test.jsx

@@ -60,6 +60,7 @@ describe('component/sidebar/sidebar_channel/SidebarChannel', () => {
  EnableXToLeaveChannelsFromLHS: 'false',
  SiteName: 'Test site',
  },
+ isOpen: false,
  showUnreadSection: false,
  publicChannelIds: ['c1', 'c2'],
  privateChannelIds: ['c3', 'c4'],
@@ -108,6 +109,7 @@ describe('component/sidebar/sidebar_channel/SidebarChannel', () => {
  },
  actions: {
  goToChannelById: jest.fn(),
+ close: jest.fn(),
  },
  };
 

tests/components/sidebar/sidebar_channel.test.jsx

@@ -61,6 +61,7 @@ describe('component/sidebar/sidebar_channel/SidebarChannel', () => {
  offTopicDisplayName: 'Off-Topic',
  membersCount: 8,
  showUnreadForMsgs: true,
+ shouldHideChannel: false,
  actions: {
  savePreferences: jest.fn(),
  leaveChannel: jest.fn(),