Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1

test/utils/Address.test.js

@@ -0,0 +1,19 @@
+const AddressImpl = artifacts.require('AddressImpl');
+const SimpleToken = artifacts.require('SimpleTokenMock');
+
+require('../helpers/setup');
+
+contract('Address', function ([_, anyone]) {
+  beforeEach(async function () {
+    this.mock = await AddressImpl.new();
+  });
+
+  it('should return false for account address', async function () {
+    (await this.mock.isContract(anyone)).should.equal(false);
+  });
+
+  it('should return true for contract address', async function () {
+    const contract = await SimpleToken.new();
+    (await this.mock.isContract(contract.address)).should.equal(true);
+  });
+});