Update test execution

This commit is contained in:
Jaco Greeff 2017-09-18 10:15:36 +02:00
parent baeab01357
commit 935d1476e9
8 changed files with 411 additions and 545 deletions

@ -1 +1 @@
Subproject commit 9ed6304313fa949ed92aa0570fb2bc759fb6dc58 Subproject commit fcac936bf68cc271a6a6ac088efb458f3a08f38a

View File

@ -1,8 +1,6 @@
{ {
"presets": [ "presets": [
"es2017", "env",
"es2016",
["es2015", { "modules": false }],
"stage-0", "stage-0",
"react" "react"
], ],
@ -10,10 +8,12 @@
"transform-decorators-legacy", "transform-decorators-legacy",
"transform-class-properties", "transform-class-properties",
"transform-object-rest-spread", "transform-object-rest-spread",
"transform-es2015-modules-commonjs" "transform-es2015-modules-commonjs",
"transform-runtime"
], ],
"retainLines": true, "retainLines": true,
"env": { "env": {
"modules": false,
"production": { "production": {
"plugins": [ "plugins": [
"transform-react-remove-prop-types" "transform-react-remove-prop-types"
@ -26,9 +26,6 @@
] ]
}, },
"test": { "test": {
"plugins": [
["babel-plugin-webpack-alias", { "config": "webpack/test.js" }]
]
} }
} }
} }

896
js/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -47,15 +47,15 @@
"start": "npm run clean && npm install && npm run build:lib && npm run start:app", "start": "npm run clean && npm install && npm run build:lib && npm run start:app",
"start:app": "node webpack/dev.server", "start:app": "node webpack/dev.server",
"start:electron": "npm run build:app && electron .build/", "start:electron": "npm run build:app && electron .build/",
"test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js' 'packages/**/*.spec.js'", "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'",
"test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js' 'packages/**/*.spec.js'", "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'",
"test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js' 'packages/**/*.e2e.js'", "test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js'",
"test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)", "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)",
"prepush": "npm run lint:cached" "prepush": "npm run lint:cached"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "6.23.0", "babel-cli": "6.26.0",
"babel-core": "6.23.1", "babel-core": "6.26.0",
"babel-eslint": "7.1.1", "babel-eslint": "7.1.1",
"babel-loader": "7.1.1", "babel-loader": "7.1.1",
"babel-plugin-react-intl": "2.3.1", "babel-plugin-react-intl": "2.3.1",
@ -64,14 +64,15 @@
"babel-plugin-transform-es2015-modules-commonjs": "6.24.1", "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
"babel-plugin-transform-object-rest-spread": "6.23.0", "babel-plugin-transform-object-rest-spread": "6.23.0",
"babel-plugin-transform-react-remove-prop-types": "0.3.2", "babel-plugin-transform-react-remove-prop-types": "0.3.2",
"babel-plugin-transform-runtime": "6.23.0",
"babel-plugin-webpack-alias": "2.1.2", "babel-plugin-webpack-alias": "2.1.2",
"babel-preset-env": "1.1.9", "babel-preset-env": "1.6.0",
"babel-preset-es2015": "6.22.0", "babel-preset-es2015": "6.24.1",
"babel-preset-es2016": "6.22.0", "babel-preset-es2016": "6.24.1",
"babel-preset-es2017": "6.22.0", "babel-preset-es2017": "6.24.1",
"babel-preset-react": "6.23.0", "babel-preset-react": "6.24.1",
"babel-preset-stage-0": "6.22.0", "babel-preset-stage-0": "6.24.1",
"babel-register": "6.23.0", "babel-register": "6.26.0",
"chai": "3.5.0", "chai": "3.5.0",
"chai-as-promised": "6.0.0", "chai-as-promised": "6.0.0",
"chai-enzyme": "0.6.1", "chai-enzyme": "0.6.1",

View File

@ -18,7 +18,7 @@ import sinon from 'sinon';
import AccountStore from './accountStore'; import AccountStore from './accountStore';
import { ACCOUNT_DEFAULT, ACCOUNT_NEW, createApi } from './parityBar.test.js'; import { ACCOUNT_NEW, createApi } from './parityBar.test.js';
let api; let api;
let store; let store;
@ -89,16 +89,6 @@ describe('ParityBar/AccountStore', () => {
}); });
}); });
describe('loadDefaultAccount', () => {
beforeEach(() => {
return store.loadDefaultAccount();
});
it('load and set the default account', () => {
expect(store.defaultAccount).to.equal(ACCOUNT_DEFAULT);
});
});
describe('makeDefaultAccount', () => { describe('makeDefaultAccount', () => {
beforeEach(() => { beforeEach(() => {
return store.makeDefaultAccount(ACCOUNT_NEW); return store.makeDefaultAccount(ACCOUNT_NEW);

View File

@ -37,6 +37,7 @@ function createApi () {
defaultAccount: sinon.stub().resolves(ACCOUNT_DEFAULT), defaultAccount: sinon.stub().resolves(ACCOUNT_DEFAULT),
allAccountsInfo: sinon.stub().resolves(ACCOUNTS), allAccountsInfo: sinon.stub().resolves(ACCOUNTS),
getNewDappsAddresses: sinon.stub().resolves(null), getNewDappsAddresses: sinon.stub().resolves(null),
registryAddress: sinon.stub().resolves(null),
setNewDappsAddresses: sinon.stub().resolves(true), setNewDappsAddresses: sinon.stub().resolves(true),
setNewDappsDefaultAddress: sinon.stub().resolves(true) setNewDappsDefaultAddress: sinon.stub().resolves(true)
} }

View File

@ -23,6 +23,7 @@ let component;
function createRedux (syncing = null) { function createRedux (syncing = null) {
return { return {
subscribe: () => {},
getState: () => { getState: () => {
return { return {
nodeStatus: { nodeStatus: {

View File

@ -15,5 +15,11 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
require('babel-register')({ require('babel-register')({
ignore: /node_modules\/(?!@parity\/(abi|api|dapps|etherscan|jsonrpc|shared|shapeshift|ui))/ ignore: function (filename) {
if (filename.indexOf('node_modules') !== -1) {
return filename.indexOf('@parity') === -1;
}
return false;
}
}); });