Merge branch 'development' into removeMigrateStep

* development:
  Fix tests
  Call static functions as static
  Address feedback
  Move our contract templates to accept Provider instead of Web3Wrapper

2 files changed, 52 insertions, 0 deletions

diff --git a/packages/web3-wrapper/test/utils/chai_setup.ts b/packages/web3-wrapper/test/utils/chai_setup.ts
new file mode 100644
index 000000000..078edd309
--- /dev/null
+++ b/packages/web3-wrapper/test/utils/chai_setup.ts
@@ -0,0 +1,13 @@
+import * as chai from 'chai';
+import chaiAsPromised = require('chai-as-promised');
+import ChaiBigNumber = require('chai-bignumber');
+import * as dirtyChai from 'dirty-chai';
+
+export const chaiSetup = {
+    configure() {
+        chai.config.includeStack = true;
+        chai.use(ChaiBigNumber());
+        chai.use(dirtyChai);
+        chai.use(chaiAsPromised);
+    },
+};
diff --git a/packages/web3-wrapper/test/web3_wrapper_test.ts b/packages/web3-wrapper/test/web3_wrapper_test.ts
new file mode 100644
index 000000000..2bf3badaa
--- /dev/null
+++ b/packages/web3-wrapper/test/web3_wrapper_test.ts
@@ -0,0 +1,39 @@
+import * as chai from 'chai';
+import * as Ganache from 'ganache-core';
+import 'mocha';
+
+import { Web3Wrapper } from '../src';
+
+import { chaiSetup } from './utils/chai_setup';
+chaiSetup.configure();
+
+const { expect } = chai;
+
+describe('Web3Wrapper tests', () => {
+    const NETWORK_ID = 50;
+    const provider = Ganache.provider({ network_id: NETWORK_ID });
+    const web3Wrapper = new Web3Wrapper(provider);
+    describe('#isAddress', () => {
+        it('correctly checks if a string is a valid ethereum address', () => {
+            expect(Web3Wrapper.isAddress('0x0')).to.be.false();
+            expect(Web3Wrapper.isAddress('0xdeadbeef')).to.be.false();
+            expect(Web3Wrapper.isAddress('42')).to.be.false();
+            expect(Web3Wrapper.isAddress('weth.thetoken.eth')).to.be.false();
+            expect(Web3Wrapper.isAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2')).to.be.true();
+            expect(Web3Wrapper.isAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2')).to.be.true();
+        });
+    });
+    describe('#getNodeVersionAsync', () => {
+        it('gets the node version', async () => {
+            const nodeVersion = await web3Wrapper.getNodeVersionAsync();
+            const NODE_VERSION = 'EthereumJS TestRPC/v2.1.0/ethereum-js';
+            expect(nodeVersion).to.be.equal(NODE_VERSION);
+        });
+    });
+    describe('#getNetworkIdAsync', () => {
+        it('gets the network id', async () => {
+            const networkId = await web3Wrapper.getNetworkIdAsync();
+            expect(networkId).to.be.equal(NETWORK_ID);
+        });
+    });
+});