Merge pull request #368 from embark-framework/await_tests

convert example tests to use await

.travis.yml

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

package.json

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

templates/boilerplate/test/contract_spec.js

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

templates/demo/test/simple_storage_spec.js

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

templates/simple/test/contract_spec.js

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

test_apps/contracts_app/test/another_storage_spec.js

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

test_apps/contracts_app/test/array_references_spec.js

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

test_apps/contracts_app/test/lib_test_spec.js

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

test_apps/contracts_app/test/simple_storage_spec.js

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

test_apps/contracts_app/test/token_spec.js

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

test_apps/test_app/embark.json

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

test_apps/test_app/test/another_storage_spec.js

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

test_apps/test_app/test/array_references_spec.js

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

test_apps/test_app/test/lib_test_spec.js

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

test_apps/test_app/test/simple_storage_spec.js

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

test_apps/test_app/test/token_spec.js

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