From ef0bc04f774974189fed5d8bd8aea05bd41bb58d Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 12 Jan 2018 18:36:29 -0500 Subject: [PATCH] clean up; fix gas requirements --- lib/core/run_tests.js | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/lib/core/run_tests.js b/lib/core/run_tests.js index 4eb10c17..9d3010fb 100644 --- a/lib/core/run_tests.js +++ b/lib/core/run_tests.js @@ -1,3 +1,4 @@ +var utils = require('../utils/utils.js'); module.exports = { run: function(filepath) { @@ -40,12 +41,12 @@ module.exports = { let Test = require('./test.js'); global.assert = require('assert'); - //global.Embark = require("../index.js"); - //global.EmbarkSpec = global.Embark.initTests(); - let configOptions = {}; + let configOptions = { + gasPrice: 1 + }; global.config = function(config) { - configOptions = config; + configOptions = utils.recursiveMerge(configOptions, config); }; // TODO: check how to pass the options //global.EmbarkSpec = new Test(options); @@ -66,22 +67,8 @@ module.exports = { runner.on('suite', function() { global.assert = require('assert'); - //global.Embark = require("../index.js"); - //global.EmbarkSpec = global.Embark.initTests(); - // TODO: check how to pass the options - //global.EmbarkSpec = new Test(options); - //global.config = function(config) { - // console.log("running config!"); - // console.log(config.hello); - // configOptions = config; - //}; - - //console.log("---------"); - //console.log(configOptions); - //console.log("---------"); global.EmbarkSpec = new Test({simulatorOptions: configOptions}); global.web3 = global.EmbarkSpec.web3; - //global.contract = Mocha.describe; }); }