Skip to content

Commit 424c7af

Browse files
iurimatiasiurimatias
committed
convert example tests to use await
1 parent 1415ce0 commit 424c7af

File tree

14 files changed

+83
-143
lines changed

14 files changed

+83
-143
lines changed

‎templates/boilerplate/test/contract_spec.js‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@
1010
// EmbarkSpec.deployAll(contractsConfig, () => { done() });
1111
// });
1212
//
13-
// it("should set constructor value", function(done) {
14-
// SimpleStorage.methods.storedData().call().then(function(result) {
15-
// assert.equal(result, 100);
16-
// done();
17-
// });
13+
// it("should set constructor value", async function() {
14+
// let result = await SimpleStorage.methods.storedData().call();
15+
// assert.equal(result, 100);
1816
// });
1917
//
20-
// it("set storage value", function(done) {
21-
// SimpleStorage.methods.set(150).send().then(function() {
22-
// SimpleStorage.methods.get().call().then(function(result) {
23-
// assert.equal(result, 150);
24-
// done();
25-
// });
26-
// });
18+
// it("set storage value", async function() {
19+
// await SimpleStorage.methods.set(150).send();
20+
// let result = await SimpleStorage.methods.get().call();
21+
// assert.equal(result, 150);
2722
// });
2823
//
2924
//});

‎templates/demo/test/simple_storage_spec.js‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@ describe("SimpleStorage", function() {
1010
EmbarkSpec.deployAll(contractsConfig, () => { done() });
1111
});
1212

13-
it("should set constructor value", function(done) {
14-
SimpleStorage.methods.storedData().call().then(function(result) {
15-
assert.equal(result, 100);
16-
done();
17-
});
13+
it("should set constructor value", async function() {
14+
let result = await SimpleStorage.methods.storedData().call();
15+
assert.equal(result, 100);
1816
});
1917

20-
it("set storage value", function(done) {
21-
SimpleStorage.methods.set(150).send().then(function() {
22-
SimpleStorage.methods.get().call().then(function(result) {
23-
assert.equal(result, 150);
24-
done();
25-
});
26-
});
18+
it("set storage value", async function() {
19+
await SimpleStorage.methods.set(150).send();
20+
let result = SimpleStorage.methods.get().call();
21+
assert.equal(result, 150);
2722
});
2823

2924
});

‎templates/simple/test/contract_spec.js‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@
1010
// EmbarkSpec.deployAll(contractsConfig, () => { done() });
1111
// });
1212
//
13-
// it("should set constructor value", function(done) {
14-
// SimpleStorage.methods.storedData().call().then(function(result) {
15-
// assert.equal(result, 100);
16-
// done();
17-
// });
13+
// it("should set constructor value", async function() {
14+
// let result = await SimpleStorage.methods.storedData().call();
15+
// assert.equal(result, 100);
1816
// });
1917
//
20-
// it("set storage value", function(done) {
21-
// SimpleStorage.methods.set(150).send().then(function() {
22-
// SimpleStorage.methods.get().call().then(function(result) {
23-
// assert.equal(result, 150);
24-
// done();
25-
// });
26-
// });
18+
// it("set storage value", async function() {
19+
// await SimpleStorage.methods.set(150).send();
20+
// let result = await SimpleStorage.methods.get().call();
21+
// assert.equal(result, 150);
2722
// });
2823
//
2924
//});

‎test_apps/contracts_app/test/another_storage_spec.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ contract("AnotherStorage", function() {
1313
EmbarkSpec.deployAll(contractsConfig, () => { done() });
1414
});
1515

16-
it("set SimpleStorage address", function(done) {
17-
AnotherStorage.methods.simpleStorageAddress().call().then(function(result) {
18-
assert.equal(result.toString(), SimpleStorage.options.address);
19-
done();
20-
});
16+
it("set SimpleStorage address", async function() {
17+
let result = await AnotherStorage.methods.simpleStorageAddress().call();
18+
assert.equal(result.toString(), SimpleStorage.options.address);
2119
});
2220

2321
});

‎test_apps/contracts_app/test/array_references_spec.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,14 @@ contract("SomeContract", function() {
2424
EmbarkSpec.deployAll(contractsConfig, () => { done() });
2525
});
2626

27-
it("set MyToken2 address", function(done) {
28-
SomeContract.methods.addr_1().call().then(function(address) {
29-
assert.equal(address, MyToken2.options.address);
30-
done();
31-
});
27+
it("set MyToken2 address", async function() {
28+
let address = await SomeContract.methods.addr_1().call();
29+
assert.equal(address, MyToken2.options.address);
3230
});
3331

34-
it("set SimpleStorage address", function(done) {
35-
SomeContract.methods.addr_2().call().then(function(address) {
36-
assert.equal(address, SimpleStorage.options.address);
37-
done();
38-
});
32+
it("set SimpleStorage address", async function() {
33+
let address = await SomeContract.methods.addr_2().call();
34+
assert.equal(address, SimpleStorage.options.address);
3935
});
4036

4137
});

‎test_apps/contracts_app/test/lib_test_spec.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ contract("Test", function() {
1414
EmbarkSpec.deployAll(contractsConfig, () => { done() });
1515
});
1616

17-
it("should call library correctly", function(done) {
18-
Test2.methods.testAdd().call().then(function(result) {
19-
assert.equal(result, 3);
20-
done();
21-
});
17+
it("should call library correctly", async function() {
18+
let result = await Test2.methods.testAdd().call();
19+
assert.equal(result, 3);
2220
});
2321

2422
});

‎test_apps/contracts_app/test/simple_storage_spec.js‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,15 @@ contract("SimpleStorage", function() {
1717
EmbarkSpec.deployAll(contractsConfig, () => { done() });
1818
});
1919

20-
it("should set constructor value", function(done) {
21-
SimpleStorage.methods.storedData().call().then(function(result) {
22-
assert.equal(result, 100);
23-
done();
24-
});
20+
it("should set constructor value", async function() {
21+
let result = await SimpleStorage.methods.storedData().call();
22+
assert.equal(result, 100);
2523
});
2624

27-
it("set storage value", function(done) {
28-
SimpleStorage.methods.set(150).send().then(function() {
29-
SimpleStorage.methods.get().call().then(function(result) {
30-
assert.equal(result, 499650);
31-
done();
32-
});
33-
});
25+
it("set storage value", async function() {
26+
await SimpleStorage.methods.set(150).send();
27+
let result = await SimpleStorage.methods.get().call();
28+
assert.equal(result, 499650);
3429
});
3530

3631
});

‎test_apps/contracts_app/test/token_spec.js‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,41 +56,32 @@ describe("Token", function() {
5656
EmbarkSpec.deployAll(contractsConfig, () => { done() });
5757
});
5858

59-
it("not deploy Token", function(done) {
59+
it("not deploy Token", function() {
6060
assert.equal(Token.address, "");
61-
done();
6261
});
6362

64-
it("not deploy MyToken and MyToken2", function(done) {
63+
it("not deploy MyToken and MyToken2", function() {
6564
assert.notEqual(MyToken.address, "");
6665
assert.notEqual(MyToken2.address, "");
67-
done();
6866
});
6967

70-
it("set MyToken Balance correctly", function(done) {
71-
MyToken.methods._supply().call().then(function(result) {
72-
assert.equal(result, 1000);
73-
done();
74-
});
68+
it("set MyToken Balance correctly", async function() {
69+
let result = await MyToken.methods._supply().call();
70+
assert.equal(result, 1000);
7571
});
7672

77-
it("set MyToken2 Balance correctly", function(done) {
78-
MyToken2.methods._supply().call().then(function(result) {
79-
assert.equal(result, 2000);
80-
done();
81-
});
73+
it("set MyToken2 Balance correctly", async function() {
74+
let result = await MyToken2.methods._supply().call();
75+
assert.equal(result, 2000);
8276
});
8377

84-
it("get right address", function(done) {
78+
it("get right address", function() {
8579
assert.equal(AlreadyDeployedToken.address, "0xCAFECAFECAFECAFECAFECAFECAFECAFECAFECAFE");
86-
done();
8780
});
8881

89-
it("should use onDeploy", function(done) {
90-
Test.methods.addr().call().then(function(result) {
91-
assert.equal(result, MyToken.address)
92-
done();
93-
});
82+
it("should use onDeploy", async function() {
83+
let result = await Test.methods.addr().call();
84+
assert.equal(result, MyToken.address)
9485
});
9586

9687
});

‎test_apps/test_app/embark.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"buildDir": "dist/",
1616
"config": "config/",
1717
"versions": {
18-
"web3.js": "1.0.0-beta.27",
1918
"solc": "0.4.18",
2019
"ipfs-api": "17.2.6"
2120
},

‎test_apps/test_app/test/another_storage_spec.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ contract("AnotherStorage", function() {
1313
EmbarkSpec.deployAll(contractsConfig, () => { done() });
1414
});
1515

16-
it("set SimpleStorage address", function(done) {
17-
AnotherStorage.methods.simpleStorageAddress().call().then(function(result) {
18-
assert.equal(result.toString(), SimpleStorage.options.address);
19-
done();
20-
});
16+
it("set SimpleStorage address", async function() {
17+
let result = await AnotherStorage.methods.simpleStorageAddress().call();
18+
assert.equal(result.toString(), SimpleStorage.options.address);
2119
});
2220

2321
});

0 commit comments

Comments
 (0)