Remove listOwners test duplication

SignHash · Dec 9, 2017 · 748887e · 748887e
1 parent 5bbc32b
commit 748887e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 27 deletions.
diff --git a/test/MultiSig/multisig.test.ts b/test/MultiSig/multisig.test.ts
@@ -56,18 +56,19 @@ contract('MultiSig', accounts => {
         ctx.multisig = await MultiSigContract.new(owners);
       });
 
-      describe('#ctor', () => {
-        it('should set owners', async () => {
-          assert.deepEqual(await ctx.multisig.listOwners(), owners);
-        });
-      });
-
+      describe('#listOwners', () => testListOwners(ctx));
       describe('#fallback', () => testFallback(ctx));
       describe('#execute', () => testExecute(ctx));
     });
   });
 });
 
+export function testListOwners(ctx: MultiSigTestContext<MultiSig>) {
+  it('should list owners', async () => {
+    assert.deepEqual(await ctx.multisig.listOwners(), ctx.owners);
+  });
+}
+
 export function testFallback(ctx: MultiSigTestContext<MultiSig>) {
   const defaultAccount = ctx.accounts[9];
 

diff --git a/test/MultiSig/recoverablemultisig.test.ts b/test/MultiSig/recoverablemultisig.test.ts
@@ -55,12 +55,6 @@ contract('RecoverableMultiSigContract', accounts => {
         );
       });
 
-      describe('#ctor', () => {
-        it('should set owners', async () => {
-          assert.deepEqual(await ctx.multisig.listOwners(), owners);
-        });
-      });
-
       describe('#startRecovery', () => testStartRecovery(ctx));
       describe('#cancelRecovery', () => testCancelRecovery(ctx));
       describe('#confirmRecovery', () => testConfirmRecovery(ctx));

diff --git a/test/MultiSig/transferablemultisig.test.ts b/test/MultiSig/transferablemultisig.test.ts
@@ -39,12 +39,6 @@ contract('TransferableMultiSigContract', accounts => {
         ctx.multisig = await TransferableMultiSigContract.new(owners);
       });
 
-      describe('#ctor', () => {
-        it('should set owners', async () => {
-          assert.deepEqual(await ctx.multisig.listOwners(), owners);
-        });
-      });
-
       describe('#transferOwnership', () => testTransferOwnership(ctx));
     });
   });

diff --git a/test/tipswallet.test.ts b/test/tipswallet.test.ts
@@ -1,13 +1,15 @@
-import { assert } from 'chai';
-
 import * as Web3 from 'web3';
 
 import { SignHashArtifacts, TipsWallet } from 'signhash';
 import { ContractContextDefinition } from 'truffle';
 
 import { assertThrowsInvalidOpcode } from './helpers';
 import { MultiSigTestContext } from './MultiSig/context';
-import { testExecute, testFallback } from './MultiSig/multisig.test';
+import {
+  testExecute,
+  testFallback,
+  testListOwners
+} from './MultiSig/multisig.test';
 import {
   testCancelRecovery,
   testConfirmRecovery,
@@ -45,12 +47,7 @@ contract('TipsWallet', accounts => {
         );
       });
 
-      describe('#ctor', () => {
-        it('should set owners', async () => {
-          assert.deepEqual(await ctx.multisig.listOwners(), owners);
-        });
-      });
-
+      describe('#listOwners', () => testListOwners(ctx));
       describe('#fallback', () => testFallback(ctx));
       describe('#execute', () => testExecute(ctx));
       describe('#transferOwnership', () => testTransferOwnership(ctx));