embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-11 14:24:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #230 from toadkicker/add_mocha_timeouts

Browse Source 
add this.timeout(15000) to tests to allow the solc enough space to work
This commit is contained in:
Iuri Matias 2017-03-08 09:47:08 -05:00 committed by GitHub
commit c1d2bd170e
6 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.coffee
View File

@ -21,6 +21,8 @@ module.exports = (grunt) ->
mochaTest:
test:
src: ['test/**/*.js']
options:
timeout: 0
jshint:
all: ['bin/embark', 'lib/**/*.js', 'js/mine.js', 'js/embark.js']

1
boilerplate/test/contract_spec.js
View File

@ -5,6 +5,7 @@ var web3 = EmbarkSpec.web3;
//describe("SimpleStorage", function() {
// before(function(done) {
// this.timeout(0);
// var contractsConfig = {
// "SimpleStorage": {
// args: [100, '0x123']

1
demo/test/simple_storage_spec.js
View File

@ -5,6 +5,7 @@ var web3 = EmbarkSpec.web3;
describe("SimpleStorage", function() {
before(function(done) {
this.timeout(0);
var contractsConfig = {
"SimpleStorage": {
args: [100]

2
lib/cmd.js
View File

@ -121,7 +121,7 @@ Cmd.prototype.test = function() {
.command('test')
.description('run tests')
.action(function() {
shelljs.exec('mocha test/ --no-timeouts');
shelljs.exec('mocha test');
});
};

2
test/compiler.js
View File

@ -12,6 +12,8 @@ describe('embark.Compiler', function() {
var compiler = new Compiler({logger: new TestLogger({})});
describe('#compile_solidity', function() {
this.timeout(0);
var expectedObject = {};
expectedObject["SimpleStorage"] = {"code":"606060405234610000576040516020806100f083398101604052515b60008190555b505b60bf806100316000396000f300606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe703903500077220029","realRuntimeBytecode": "606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820","runtimeBytecode":"606060405263ffffffff60e060020a6000350416632a1afcd98114603657806360fe47b11460525780636d4ce63c146061575b6000565b346000576040607d565b60408051918252519081900360200190f35b34600057605f6004356083565b005b346000576040608c565b60408051918252519081900360200190f35b60005481565b60008190555b50565b6000545b905600a165627a7a72305820a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe703903500077220029","swarmHash": "a250be048d43f54e9afbb37211dc73ba843d23b95863b60afe70390350007722","gasEstimates":{"creation":[20131,38200],"external":{"get()":269,"set(uint256)":20163,"storedData()":224},"internal":{}},"functionHashes":{"get()":"6d4ce63c","set(uint256)":"60fe47b1","storedData()":"2a1afcd9"},"abiDefinition":[{"constant":true,"inputs":[],"name":"storedData","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"x","type":"uint256"}],"name":"set","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"get","outputs":[{"name":"retVal","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[{"name":"initialValue","type":"uint256"}],"payable":false,"type":"constructor"}]};

1
test/contracts.js
View File

@ -9,6 +9,7 @@ var readFile = function(file) {
};
describe('embark.Contratcs', function() {
describe('simple', function() {
var contractsManager = new ContractsManager({
contractFiles: [