Skip to content

Commit

Permalink
Upgrading dependencies. (mattermost#1369)
Browse files Browse the repository at this point in the history
* Upgrading dependencies.

* Fixing tests and jest.
  • Loading branch information
crspeller authored and grundleborg committed Jun 22, 2018
1 parent 5fd32dc commit 7db9495
Show file tree
Hide file tree
Showing 13 changed files with 1,220 additions and 2,770 deletions.
3,878 changes: 1,148 additions & 2,730 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,51 @@
"flux": "3.1.3",
"font-awesome": "4.7.0",
"highlight.js": "9.12.0",
"hoist-non-react-statics": "2.5.0",
"hoist-non-react-statics": "2.5.5",
"html-to-react": "1.3.3",
"inobounce": "0.1.6",
"intl": "1.2.5",
"jasny-bootstrap": "3.1.3",
"jquery": "3.3.1",
"katex": "0.9.0",
"key-mirror": "1.0.1",
"localforage": "1.7.1",
"localforage": "1.7.2",
"localforage-observable": "1.4.0",
"marked": "github:mattermost/marked#ed33baecd7d7fa97d479ba22dde9d226b083d67d",
"mattermost-redux": "github:mattermost/mattermost-redux#6aee7c45bcde7d2079ee5b24f70e7e8d071ae0a6",
"moment-timezone": "0.5.17",
"moment-timezone": "0.5.20",
"pdfjs-dist": "2.0.489",
"perfect-scrollbar": "0.8.1",
"prop-types": "15.6.1",
"react": "16.3.2",
"prop-types": "15.6.2",
"react": "16.4.1",
"react-addons-pure-render-mixin": "15.6.2",
"react-bootstrap": "0.32.1",
"react-color": "2.14.1",
"react-contextmenu": "2.9.2",
"react-custom-scrollbars": "4.2.1",
"react-dom": "16.3.2",
"react-dom": "16.4.1",
"react-intl": "2.4.0",
"react-redux": "5.0.7",
"react-router-dom": "4.2.2",
"react-router-dom": "4.3.1",
"react-select": "1.2.1",
"redux": "4.0.0",
"redux-batched-actions": "0.3.0",
"redux-persist": "4.9.1",
"redux-persist-transform-filter": "0.0.16",
"redux-persist-transform-filter": "0.0.18",
"reselect": "3.0.1",
"smoothscroll-polyfill": "0.4.3",
"superagent": "3.8.3",
"twemoji": "2.5.1",
"twemoji": "11.0.0",
"url-search-params-polyfill": "4.0.0",
"webrtc-adapter": "6.1.5",
"webrtc-adapter": "6.2.1",
"whatwg-fetch": "2.0.4",
"xregexp": "4.1.1"
"xregexp": "4.2.0"
},
"devDependencies": {
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-eslint": "8.2.3",
"babel-jest": "22.4.3",
"babel-jest": "23.0.1",
"babel-loader": "7.1.4",
"babel-plugin-dynamic-import-node": "1.2.0",
"babel-plugin-module-resolver": "3.1.1",
Expand All @@ -72,38 +72,38 @@
"babel-runtime": "6.26.0",
"bundle-loader": "0.5.6",
"copy-webpack-plugin": "4.5.1",
"cross-env": "5.1.5",
"cross-env": "5.2.0",
"css-loader": "0.28.11",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.3",
"enzyme-to-json": "3.3.4",
"eslint": "4.19.1",
"eslint-import-resolver-webpack": "0.9.0",
"eslint-import-resolver-webpack": "0.10.0",
"eslint-plugin-header": "^1.2.0",
"eslint-plugin-import": "2.11.0",
"eslint-plugin-react": "7.8.2",
"eslint-plugin-import": "2.12.0",
"eslint-plugin-react": "7.9.1",
"exports-loader": "0.7.0",
"file-loader": "1.1.11",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"identity-obj-proxy": "3.0.0",
"image-webpack-loader": "3.6.0",
"image-webpack-loader": "4.3.1",
"imports-loader": "0.8.0",
"jest": "22.4.3",
"jest-canvas-mock": "1.0.2",
"jest-cli": "22.4.3",
"jest": "23.1.0",
"jest-canvas-mock": "1.0.3",
"jest-cli": "23.1.0",
"jquery-deferred": "0.3.1",
"mini-css-extract-plugin": "0.4.0",
"nightwatch": "0.9.21",
"node-sass": "4.9.0",
"redux-mock-store": "1.5.1",
"redux-mock-store": "1.5.3",
"redux-persist-node-storage": "2.0.0",
"remote-redux-devtools": "0.5.12",
"sass-loader": "7.0.1",
"selenium-standalone": "6.14.1",
"sass-loader": "7.0.3",
"selenium-standalone": "6.15.1",
"style-loader": "0.21.0",
"webpack": "4.8.3",
"webpack-cli": "2.1.3",
"webpack": "4.12.0",
"webpack-cli": "3.0.8",
"webpack-node-externals": "1.7.2",
"yup": "0.24.1"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/components/activity_log_modal.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('components/ActivityLogModal', () => {
});

test('should match snapshot when submitRevoke is called', () => {
const revokeSession = jest.genMockFunction().mockImplementation(
const revokeSession = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ exports[`components/admin_console/request_button/request_button.jsx should match
[Function],
],
],
"results": Array [
Object {
"isThrow": false,
"value": undefined,
},
],
}
}
saveNeeded={false}
Expand Down Expand Up @@ -225,6 +231,16 @@ exports[`components/admin_console/request_button/request_button.jsx should match
[Function],
],
],
"results": Array [
Object {
"isThrow": false,
"value": undefined,
},
Object {
"isThrow": false,
"value": undefined,
},
],
}
}
saveNeeded={false}
Expand Down Expand Up @@ -356,6 +372,12 @@ exports[`components/admin_console/request_button/request_button.jsx should match
[Function],
],
],
"results": Array [
Object {
"isThrow": false,
"value": undefined,
},
],
}
}
saveNeeded={false}
Expand Down Expand Up @@ -487,6 +509,16 @@ exports[`components/admin_console/request_button/request_button.jsx should match
[Function],
],
],
"results": Array [
Object {
"isThrow": false,
"value": undefined,
},
Object {
"isThrow": false,
"value": undefined,
},
],
}
}
saveNeeded={false}
Expand Down
2 changes: 1 addition & 1 deletion tests/components/create_team/team_url.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('/components/create_team/components/display_name', () => {
});

test('should successfully submit', () => {
defaultProps.actions.checkIfTeamExists = jest.genMockFunction().mockImplementation(
defaultProps.actions.checkIfTeamExists = jest.fn().mockImplementation(
() => {
defaultProps.actions.createTeam();
}
Expand Down
4 changes: 2 additions & 2 deletions tests/components/integrations/abstract_command.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('components/integrations/AbstractCommand', () => {
name: 'test',
id: command.team_id,
};
const action = jest.genMockFunction().mockImplementation(
const action = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('components/integrations/AbstractCommand', () => {
});

test('should match state when handleSubmit is called', () => {
const newAction = jest.genMockFunction().mockImplementation(
const newAction = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('components/integrations/AbstractIncomingWebhook', () => {
const enablePostUsernameOverride = true;
const enablePostIconOverride = true;

const action = jest.genMockFunction().mockImplementation(
const action = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
2 changes: 1 addition & 1 deletion tests/components/integrations/abstract_oauth_app.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('components/integrations/AbstractOAuthApp', () => {
update_at: 1501365458934,
callback_urls: ['https://test.com/callback', 'https://test.com/callback2'],
};
const action = jest.genMockFunction().mockImplementation(
const action = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
4 changes: 2 additions & 2 deletions tests/components/integrations/edit_oauth_app.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('components/integrations/EditOAuthApp', () => {
});

test('should have match when submitOAuthApp is called on success', async () => {
baseProps.actions.editOAuthApp = jest.genMockFunction().mockImplementation(
baseProps.actions.editOAuthApp = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve({
Expand All @@ -142,7 +142,7 @@ describe('components/integrations/EditOAuthApp', () => {
});

test('should have match when submitOAuthApp is called on error', async () => {
baseProps.actions.editOAuthApp = jest.genMockFunction().mockImplementation(
baseProps.actions.editOAuthApp = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve({
Expand Down
4 changes: 2 additions & 2 deletions tests/components/integrations/installed_oauth_app.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('components/integrations/InstalledOAuthApp', () => {
});

test('should call onRegenerateSecret function', () => {
const newOnRegenerateSecret = jest.genMockFunction().mockImplementation(
const newOnRegenerateSecret = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down Expand Up @@ -111,7 +111,7 @@ describe('components/integrations/InstalledOAuthApp', () => {
});

test('should match on handleRegenerate', () => {
const newOnRegenerateSecret = jest.genMockFunction().mockImplementation(
const newOnRegenerateSecret = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('components/integrations/InstalledOAuthApps', () => {
};

test('should match snapshot', () => {
const newGetOAuthApps = jest.genMockFunction().mockImplementation(
const newGetOAuthApps = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ exports[`components/navbar/NavbarInfoButton should match snapshot, without chann
id="navbar.noHeader"
values={Object {}}
/>
<UNDEFINED>
<React.Fragment>
<br />
<FormattedMessage
defaultMessage="{clickHere} to add one."
Expand All @@ -186,7 +186,7 @@ exports[`components/navbar/NavbarInfoButton should match snapshot, without chann
}
}
/>
</UNDEFINED>
</React.Fragment>
</div>
<div
className="close visible-xs-block"
Expand Down
2 changes: 1 addition & 1 deletion tests/components/reset_status_modal.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {shallow} from 'enzyme';
import ResetStatusModal from 'components/reset_status_modal/reset_status_modal.jsx';

describe('components/ResetStatusModal', () => {
const autoResetStatus = jest.genMockFunction().mockImplementation(
const autoResetStatus = jest.fn().mockImplementation(
() => {
return new Promise((resolve) => {
process.nextTick(() => resolve({status: 'away'}));
Expand Down

0 comments on commit 7db9495

Please sign in to comment.