From 7a930d95a8e0f555fa9aff8fdaea790632b17e78 Mon Sep 17 00:00:00 2001 From: Todd Baur Date: Wed, 8 Mar 2017 23:28:10 +0900 Subject: [PATCH] switch config to grunt vs declaring in test --- Gruntfile.coffee | 2 ++ test/compiler.js | 1 - test/contracts.js | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 24f23def8..b3eb1166a 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -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'] diff --git a/test/compiler.js b/test/compiler.js index 806da7aec..19c05843c 100644 --- a/test/compiler.js +++ b/test/compiler.js @@ -12,7 +12,6 @@ describe('embark.Compiler', function() { var compiler = new Compiler({logger: new TestLogger({})}); describe('#compile_solidity', function() { - this.timeout(15000); var expectedObject = {}; diff --git a/test/contracts.js b/test/contracts.js index 58a7b053c..57b65bcf3 100644 --- a/test/contracts.js +++ b/test/contracts.js @@ -9,7 +9,6 @@ var readFile = function(file) { }; describe('embark.Contratcs', function() { - this.timeout(15000); describe('simple', function() { var contractsManager = new ContractsManager({