embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge develop

This commit is contained in:
Todd Baur 2017-03-12 12:25:10 +09:00
parent 383b3c31a5 3a50dbdfdd
commit 32953f7204
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boilerplate/test/contract_spec.js
View File

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

2
demo/test/simple_storage_spec.js
View File

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

2
test_app/test/token_spec.js
View File

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