Merge branch 'features/test-revamp-multi' of https://github.com/embark-framework/embark into features/test-revamp-multi

# Conflicts:
#	lib/contracts/contract_deployer.js
#	lib/i18n/locales/en.json
#	lib/tests/test.js
#	package-lock.json
This commit is contained in:
Jonathan Rainville 2018-06-01 13:57:39 -04:00
commit aa04279a6f

View File

@ -66,8 +66,6 @@ class Test {
trackContracts: false
});
this.engine.startService("codeGenerator");
}
init(callback) {
const self = this;
this.engine.contractsManager.build(() => {
@ -75,6 +73,7 @@ class Test {
callback();
});
}
}
onReady(callback) {
if (this.ready) {
@ -149,12 +148,12 @@ class Test {
}, next);
}
], function (err) {
if (err) {
if (err) {
console.log(__('terminating due to error'));
return callback(err);
}
}
callback();
});
});
}
require(module) {