mirror of
https://github.com/status-im/embark-area-51.git
synced 2025-01-24 22:19:37 +00:00
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:
commit
aa04279a6f
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user