MM-26512 Update Jest to fix unexpected outcome on unit tests (matterm…

…ost#5856) * update jest to fix unexpected behaviour on unit tests * explicitly add cache directory to Jest * downgrade jest to 25 * revert cacheDirectory Co-authored-by: Saturnino Abril <[email protected]>
koox00 · Jul 8, 2020 · caf8872 · caf8872
1 parent 18dd094
commit caf8872
Show file tree

Hide file tree

Showing 40 changed files with 5,305 additions and 3,153 deletions.
diff --git a/actions/post_actions.test.js b/actions/post_actions.test.js
@@ -29,7 +29,7 @@ jest.mock('actions/emoji_actions', () => ({
 }));
 
 jest.mock('actions/storage', () => {
- const original = require.requireActual('actions/storage');
+ const original = jest.requireActual('actions/storage');
  return {
  ...original,
  setGlobalItem: (...args) => ({type: 'MOCK_SET_GLOBAL_ITEM', args}),

diff --git a/actions/user_actions.test.js b/actions/user_actions.test.js
@@ -18,7 +18,7 @@ const mockChannelsObj1 = [{id: 'gmChannel1', type: General.GM_CHANNEL}];
 const mockChannelsObj2 = [{id: 'gmChannel', type: General.GM_CHANNEL}];
 
 jest.mock('mattermost-redux/actions/users', () => {
- const original = require.requireActual('mattermost-redux/actions/users');
+ const original = jest.requireActual('mattermost-redux/actions/users');
  return {
  ...original,
  searchProfiles: (...args) => ({type: 'MOCK_SEARCH_PROFILES', args}),
@@ -30,8 +30,8 @@ jest.mock('mattermost-redux/actions/users', () => {
 });
 
 jest.mock('mattermost-redux/selectors/entities/channel_categories', () => {
- const GeneralTypes = require.requireActual('mattermost-redux/constants').General;
- const original = require.requireActual('mattermost-redux/selectors/entities/channel_categories');
+ const GeneralTypes = jest.requireActual('mattermost-redux/constants').General;
+ const original = jest.requireActual('mattermost-redux/selectors/entities/channel_categories');
 
  const mockChannelsObj = [{id: 'gmChannel', type: GeneralTypes.GM_CHANNEL}];
  const mockFunc = jest.fn();
@@ -43,23 +43,23 @@ jest.mock('mattermost-redux/selectors/entities/channel_categories', () => {
 });
 
 jest.mock('mattermost-redux/actions/teams', () => {
- const original = require.requireActual('mattermost-redux/actions/teams');
+ const original = jest.requireActual('mattermost-redux/actions/teams');
  return {
  ...original,
  getTeamMembersByIds: (...args) => ({type: 'MOCK_GET_TEAM_MEMBERS_BY_IDS', args}),
  };
 });
 
 jest.mock('mattermost-redux/actions/channels', () => {
- const original = require.requireActual('mattermost-redux/actions/channels');
+ const original = jest.requireActual('mattermost-redux/actions/channels');
  return {
  ...original,
  getChannelMembersByIds: (...args) => ({type: 'MOCK_GET_CHANNEL_MEMBERS_BY_IDS', args}),
  };
 });
 
 jest.mock('mattermost-redux/actions/preferences', () => {
- const original = require.requireActual('mattermost-redux/actions/preferences');
+ const original = jest.requireActual('mattermost-redux/actions/preferences');
  return {
  ...original,
  deletePreferences: (...args) => ({type: 'MOCK_DELETE_PREFERENCES', args}),

diff --git a/actions/views/create_comment.test.jsx b/actions/views/create_comment.test.jsx
@@ -62,7 +62,7 @@ jest.mock('actions/post_actions.jsx', () => ({
 }));
 
 jest.mock('actions/storage', () => {
- const original = require.requireActual('actions/storage');
+ const original = jest.requireActual('actions/storage');
  return {
  ...original,
  setGlobalItem: (...args) => ({type: 'MOCK_SET_GLOBAL_ITEM', args}),

diff --git a/actions/views/root.test.js b/actions/views/root.test.js
@@ -9,7 +9,7 @@ import * as Actions from 'actions/views/root';
 const mockStore = configureStore([thunk]);
 
 jest.mock('mattermost-redux/actions/general', () => {
- const original = require.requireActual('mattermost-redux/actions/general');
+ const original = jest.requireActual('mattermost-redux/actions/general');
  return {
  ...original,
  getClientConfig: () => ({type: 'MOCK_GET_CLIENT_CONFIG'}),
@@ -18,7 +18,7 @@ jest.mock('mattermost-redux/actions/general', () => {
 });
 
 jest.mock('mattermost-redux/actions/users', () => {
- const original = require.requireActual('mattermost-redux/actions/users');
+ const original = jest.requireActual('mattermost-redux/actions/users');
  return {
  ...original,
  loadMe: () => ({type: 'MOCK_LOAD_ME'}),

diff --git a/components/__snapshots__/profile_picture.test.tsx.snap b/components/__snapshots__/profile_picture.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`components/ProfilePicture should match snapshot, profile and src, defau
 <OverlayTrigger
  defaultOverlayShown={false}
  overlay={
- <UNDEFINED
+ <Memo(Connect(injectIntl(ProfilePopover)))
  className="user-profile-popover"
  hasMention={false}
  hide={[Function]}

diff --git a/components/admin_console/admin_sidebar/admin_sidebar.test.jsx b/components/admin_console/admin_sidebar/admin_sidebar.test.jsx
@@ -11,7 +11,7 @@ import AdminDefinition from 'components/admin_console/admin_definition';
 import {generateIndex} from 'utils/admin_console_index';
 
 jest.mock('utils/utils', () => {
- const original = require.requireActual('utils/utils');
+ const original = jest.requireActual('utils/utils');
  return {
  ...original,
  isMobile: jest.fn(() => true),

diff --git a/...chemes_settings/guest_permissions_tree/__snapshots__/guest_permissions_tree.test.jsx.snap b/...chemes_settings/guest_permissions_tree/__snapshots__/guest_permissions_tree.test.jsx.snap
@@ -33,7 +33,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -151,7 +151,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -269,7 +269,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -380,7 +380,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -498,7 +498,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -616,7 +616,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -734,7 +734,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "guest_edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },

diff --git a/...permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.jsx.snap b/...permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.jsx.snap
@@ -33,7 +33,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -167,7 +167,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -309,7 +309,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -451,7 +451,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -593,7 +593,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -735,7 +735,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },
@@ -877,7 +877,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh
  additionalValues={
  Object {
  "edit_post": Object {
- "editTimeLimitButton": <UNDEFINED
+ "editTimeLimitButton": <Memo(Connect(EditPostTimeLimitButton))
  onClick={[Function]}
  />,
  },