merge develop

This commit is contained in:
Todd Baur 2017-03-12 12:25:10 +09:00
commit 32953f7204
3 changed files with 4 additions and 2 deletions

View File

@ -1,5 +1,5 @@
var assert = require('assert');
var Embark = require('embark')();
var Embark = require('embark');
var EmbarkSpec = Embark.initTests();
var web3 = EmbarkSpec.web3;

View File

@ -1,5 +1,5 @@
var assert = require('assert');
var Embark = require('embark')();
var Embark = require('embark');
var EmbarkSpec = Embark.initTests();
var web3 = EmbarkSpec.web3;

View File

@ -1,6 +1,8 @@
var assert = require('assert');
var Embark = require('embark');
var EmbarkSpec = require('../node_modules/embark/lib/core/test.js');
var Embark = require('embark');
var EmbarkSpec = Embark.initTests();
var web3 = EmbarkSpec.web3;
describe("Token", function() {