diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2017-07-31 10:32:59 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2017-07-31 10:43:13 +0100 |
| commit | d4a94c7634ec8f396c81f3e3e65629ec37bff447 (patch) | |
| tree | 3e00c7e1e7b314ea8f32b53ed64310ba440a23f2 | |
| parent | c37ade4bb002efa244f152e89ca183664995325e (diff) | |
| download | mullvadvpn-d4a94c7634ec8f396c81f3e3e65629ec37bff447.tar.xz mullvadvpn-d4a94c7634ec8f396c81f3e3e65629ec37bff447.zip | |
Remove isomorphic-fetch since 'electron-mocha --renderer' runs tests in Webkit
| -rw-r--r-- | flow-typed/npm/isomorphic-fetch_v2.x.x.js | 7 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | test/mocks/redux.js | 6 | ||||
| -rw-r--r-- | yarn.lock | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/flow-typed/npm/isomorphic-fetch_v2.x.x.js b/flow-typed/npm/isomorphic-fetch_v2.x.x.js deleted file mode 100644 index ce5712ed7f..0000000000 --- a/flow-typed/npm/isomorphic-fetch_v2.x.x.js +++ /dev/null @@ -1,7 +0,0 @@ -// flow-typed signature: 28ad27471ba2cb831af6a1f17b7f0cf0 -// flow-typed version: f3161dc07c/isomorphic-fetch_v2.x.x/flow_>=v0.25.x - - -declare module 'isomorphic-fetch' { - declare module.exports: (input: string | Request, init?: RequestOptions) => Promise<Response>; -} diff --git a/package.json b/package.json index 5ea8575d00..2d3f89e984 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "eslint-plugin-react": "^7.1.0", "flow-bin": "^0.50.0", "flow-typed": "^2.1.5", - "isomorphic-fetch": "^2.2.1", "npm-run-all": "^4.0.1", "redux-mock-store": "^1.2.2", "rimraf": "^2.5.4" diff --git a/test/mocks/redux.js b/test/mocks/redux.js index 070c76c9b2..9d4759b1d3 100644 --- a/test/mocks/redux.js +++ b/test/mocks/redux.js @@ -2,10 +2,6 @@ import configureMockStore from 'redux-mock-store'; import thunk from 'redux-thunk'; import { defaultServer } from '../../app/config'; -// fetch is absent in node environment -// this will automatically import it into global scope -import fetch from 'isomorphic-fetch'; // eslint-disable-line no-unused-vars - const middlewares = [ thunk ]; export const mockStore = configureMockStore(middlewares); export const mockState = () => { @@ -36,7 +32,7 @@ export const filterMinorActions = (actions) => { if(action.type === 'CONNECTION_CHANGE' && action.payload.isOnline) { return false; } - + if(action.type === 'USER_LOGIN_CHANGE' && action.payload.city) { return false; } @@ -3191,7 +3191,7 @@ isobject@^2.0.0: dependencies: isarray "1.0.0" -isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" dependencies: @@ -3451,7 +3451,7 @@ lodash@^3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: +lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" |