status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #368 from embark-framework/await_tests 

convert example tests to use await
This commit is contained in:
Jonathan Rainville 2018-04-17 14:59:57 -04:00 committed by GitHub
parent e5ae6bc86e 424c7afc70
commit 0948b04366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 84 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,7 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- "7" - "7"
- "6"
addons: addons:
code_climate: code_climate:
repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358 repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358

2
package.json
View File

@ -59,7 +59,7 @@
"underscore.string": "^3.3.4", "underscore.string": "^3.3.4",
"url-loader": "^0.6.2", "url-loader": "^0.6.2",
"viz.js": "^1.8.1", "viz.js": "^1.8.1",
"web3": "1.0.0-beta.27", "web3": "1.0.0-beta.34",
"webpack": "^3.10.0", "webpack": "^3.10.0",
"window-size": "^1.1.0" "window-size": "^1.1.0"
}, },

15
templates/boilerplate/test/contract_spec.js
View File

@ -10,20 +10,15 @@
// EmbarkSpec.deployAll(contractsConfig, () => { done() }); // EmbarkSpec.deployAll(contractsConfig, () => { done() });
// }); // });
// //
// it("should set constructor value", function(done) { // it("should set constructor value", async function() {
// SimpleStorage.methods.storedData().call().then(function(result) { // let result = await SimpleStorage.methods.storedData().call();
// assert.equal(result, 100); // assert.equal(result, 100);
// done();
// });
// }); // });
// //
// it("set storage value", function(done) { // it("set storage value", async function() {
// SimpleStorage.methods.set(150).send().then(function() { // await SimpleStorage.methods.set(150).send();
// SimpleStorage.methods.get().call().then(function(result) { // let result = await SimpleStorage.methods.get().call();
// assert.equal(result, 150); // assert.equal(result, 150);
// done();
// });
// });
// }); // });
// //
//}); //});

15
templates/demo/test/simple_storage_spec.js
View File

@ -10,20 +10,15 @@ describe("SimpleStorage", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("should set constructor value", function(done) { it("should set constructor value", async function() {
SimpleStorage.methods.storedData().call().then(function(result) { let result = await SimpleStorage.methods.storedData().call();
assert.equal(result, 100); assert.equal(result, 100);
done();
});
}); });
it("set storage value", function(done) { it("set storage value", async function() {
SimpleStorage.methods.set(150).send().then(function() { await SimpleStorage.methods.set(150).send();
SimpleStorage.methods.get().call().then(function(result) { let result = SimpleStorage.methods.get().call();
assert.equal(result, 150); assert.equal(result, 150);
done();
});
});
}); });
}); });

15
templates/simple/test/contract_spec.js
View File

@ -10,20 +10,15 @@
// EmbarkSpec.deployAll(contractsConfig, () => { done() }); // EmbarkSpec.deployAll(contractsConfig, () => { done() });
// }); // });
// //
// it("should set constructor value", function(done) { // it("should set constructor value", async function() {
// SimpleStorage.methods.storedData().call().then(function(result) { // let result = await SimpleStorage.methods.storedData().call();
// assert.equal(result, 100); // assert.equal(result, 100);
// done();
// });
// }); // });
// //
// it("set storage value", function(done) { // it("set storage value", async function() {
// SimpleStorage.methods.set(150).send().then(function() { // await SimpleStorage.methods.set(150).send();
// SimpleStorage.methods.get().call().then(function(result) { // let result = await SimpleStorage.methods.get().call();
// assert.equal(result, 150); // assert.equal(result, 150);
// done();
// });
// });
// }); // });
// //
//}); //});

6
test_apps/contracts_app/test/another_storage_spec.js
View File

@ -13,11 +13,9 @@ contract("AnotherStorage", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("set SimpleStorage address", function(done) { it("set SimpleStorage address", async function() {
AnotherStorage.methods.simpleStorageAddress().call().then(function(result) { let result = await AnotherStorage.methods.simpleStorageAddress().call();
assert.equal(result.toString(), SimpleStorage.options.address); assert.equal(result.toString(), SimpleStorage.options.address);
done();
});
}); });
}); });

12
test_apps/contracts_app/test/array_references_spec.js
View File

@ -24,18 +24,14 @@ contract("SomeContract", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("set MyToken2 address", function(done) { it("set MyToken2 address", async function() {
SomeContract.methods.addr_1().call().then(function(address) { let address = await SomeContract.methods.addr_1().call();
assert.equal(address, MyToken2.options.address); assert.equal(address, MyToken2.options.address);
done();
});
}); });
it("set SimpleStorage address", function(done) { it("set SimpleStorage address", async function() {
SomeContract.methods.addr_2().call().then(function(address) { let address = await SomeContract.methods.addr_2().call();
assert.equal(address, SimpleStorage.options.address); assert.equal(address, SimpleStorage.options.address);
done();
});
}); });
}); });

6
test_apps/contracts_app/test/lib_test_spec.js
View File

@ -14,11 +14,9 @@ contract("Test", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("should call library correctly", function(done) { it("should call library correctly", async function() {
Test2.methods.testAdd().call().then(function(result) { let result = await Test2.methods.testAdd().call();
assert.equal(result, 3); assert.equal(result, 3);
done();
});
}); });
}); });

15
test_apps/contracts_app/test/simple_storage_spec.js
View File

@ -17,20 +17,15 @@ contract("SimpleStorage", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("should set constructor value", function(done) { it("should set constructor value", async function() {
SimpleStorage.methods.storedData().call().then(function(result) { let result = await SimpleStorage.methods.storedData().call();
assert.equal(result, 100); assert.equal(result, 100);
done();
});
}); });
it("set storage value", function(done) { it("set storage value", async function() {
SimpleStorage.methods.set(150).send().then(function() { await SimpleStorage.methods.set(150).send();
SimpleStorage.methods.get().call().then(function(result) { let result = await SimpleStorage.methods.get().call();
assert.equal(result, 499650); assert.equal(result, 499650);
done();
});
});
}); });
}); });

27
test_apps/contracts_app/test/token_spec.js
View File

@ -56,41 +56,32 @@ describe("Token", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("not deploy Token", function(done) { it("not deploy Token", function() {
assert.equal(Token.address, ""); assert.equal(Token.address, "");
done();
}); });
it("not deploy MyToken and MyToken2", function(done) { it("not deploy MyToken and MyToken2", function() {
assert.notEqual(MyToken.address, ""); assert.notEqual(MyToken.address, "");
assert.notEqual(MyToken2.address, ""); assert.notEqual(MyToken2.address, "");
done();
}); });
it("set MyToken Balance correctly", function(done) { it("set MyToken Balance correctly", async function() {
MyToken.methods._supply().call().then(function(result) { let result = await MyToken.methods._supply().call();
assert.equal(result, 1000); assert.equal(result, 1000);
done();
});
}); });
it("set MyToken2 Balance correctly", function(done) { it("set MyToken2 Balance correctly", async function() {
MyToken2.methods._supply().call().then(function(result) { let result = await MyToken2.methods._supply().call();
assert.equal(result, 2000); assert.equal(result, 2000);
done();
});
}); });
it("get right address", function(done) { it("get right address", function() {
assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE"); assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE");
done();
}); });
it("should use onDeploy", function(done) { it("should use onDeploy", async function() {
Test.methods.addr().call().then(function(result) { let result = await Test.methods.addr().call();
assert.equal(result, MyToken.address) assert.equal(result, MyToken.address)
done();
});
}); });
}); });

1
test_apps/test_app/embark.json
View File

@ -15,7 +15,6 @@
"buildDir": "dist/", "buildDir": "dist/",
"config": "config/", "config": "config/",
"versions": { "versions": {
"web3.js": "1.0.0-beta.27",
"solc": "0.4.18", "solc": "0.4.18",
"ipfs-api": "17.2.6" "ipfs-api": "17.2.6"
}, },

6
test_apps/test_app/test/another_storage_spec.js
View File

@ -13,11 +13,9 @@ contract("AnotherStorage", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("set SimpleStorage address", function(done) { it("set SimpleStorage address", async function() {
AnotherStorage.methods.simpleStorageAddress().call().then(function(result) { let result = await AnotherStorage.methods.simpleStorageAddress().call();
assert.equal(result.toString(), SimpleStorage.options.address); assert.equal(result.toString(), SimpleStorage.options.address);
done();
});
}); });
}); });

12
test_apps/test_app/test/array_references_spec.js
View File

@ -24,18 +24,14 @@ contract("SomeContract", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("set MyToken2 address", function(done) { it("set MyToken2 address", async function() {
SomeContract.methods.addr_1().call().then(function(address) { let address = await SomeContract.methods.addr_1().call();
assert.equal(address, MyToken2.options.address); assert.equal(address, MyToken2.options.address);
done();
});
}); });
it("set SimpleStorage address", function(done) { it("set SimpleStorage address", async function() {
SomeContract.methods.addr_2().call().then(function(address) { let address = await SomeContract.methods.addr_2().call();
assert.equal(address, SimpleStorage.options.address); assert.equal(address, SimpleStorage.options.address);
done();
});
}); });
}); });

6
test_apps/test_app/test/lib_test_spec.js
View File

@ -14,11 +14,9 @@ contract("Test", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("should call library correctly", function(done) { it("should call library correctly", async function() {
Test2.methods.testAdd().call().then(function(result) { let result = await Test2.methods.testAdd().call();
assert.equal(result, 3); assert.equal(result, 3);
done();
});
}); });
}); });

15
test_apps/test_app/test/simple_storage_spec.js
View File

@ -17,20 +17,15 @@ contract("SimpleStorage", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("should set constructor value", function(done) { it("should set constructor value", async function() {
SimpleStorage.methods.storedData().call().then(function(result) { let result = await SimpleStorage.methods.storedData().call();
assert.equal(result, 100); assert.equal(result, 100);
done();
});
}); });
it("set storage value", function(done) { it("set storage value", async function() {
SimpleStorage.methods.set(150).send().then(function() { await SimpleStorage.methods.set(150).send();
SimpleStorage.methods.get().call().then(function(result) { let result = await SimpleStorage.methods.get().call();
assert.equal(result, 499650); assert.equal(result, 499650);
done();
});
});
}); });
}); });

27
test_apps/test_app/test/token_spec.js
View File

@ -56,41 +56,32 @@ describe("Token", function() {
EmbarkSpec.deployAll(contractsConfig, () => { done() }); EmbarkSpec.deployAll(contractsConfig, () => { done() });
}); });
it("not deploy Token", function(done) { it("not deploy Token", function() {
assert.equal(Token.address, ""); assert.equal(Token.address, "");
done();
}); });
it("not deploy MyToken and MyToken2", function(done) { it("not deploy MyToken and MyToken2", function() {
assert.notEqual(MyToken.address, ""); assert.notEqual(MyToken.address, "");
assert.notEqual(MyToken2.address, ""); assert.notEqual(MyToken2.address, "");
done();
}); });
it("set MyToken Balance correctly", function(done) { it("set MyToken Balance correctly", async function() {
MyToken.methods._supply().call().then(function(result) { let result = await MyToken.methods._supply().call();
assert.equal(result, 1000); assert.equal(result, 1000);
done();
});
}); });
it("set MyToken2 Balance correctly", function(done) { it("set MyToken2 Balance correctly", async function() {
MyToken2.methods._supply().call().then(function(result) { let result = await MyToken2.methods._supply().call();
assert.equal(result, 2000); assert.equal(result, 2000);
done();
});
}); });
it("get right address", function(done) { it("get right address", function() {
assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE"); assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE");
done();
}); });
it("should use onDeploy", function(done) { it("should use onDeploy", async function() {
Test.methods.addr().call().then(function(result) { let result = await Test.methods.addr().call();
assert.equal(result, MyToken.address) assert.equal(result, MyToken.address)
done();
});
}); });
}); });