FABN-1455: Re-enable unit tests for transactioneventhandler.js (#99)

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
hyperledger · Jan 23, 2020 · ca25500 · ca25500
1 parent f5ab6a8
commit ca25500
Show file tree

Hide file tree

Showing 4 changed files with 611 additions and 1,048 deletions.
diff --git a/fabric-network/test/contract.js b/fabric-network/test/contract.js
@@ -42,27 +42,29 @@ describe('Contract', () => {
 	let discoveryService;
 
 	beforeEach(() => {
+		discoveryService = sinon.createStubInstance(DiscoveryService);
+		discoveryService.newHandler.returns('handler');
+
 		channel = sinon.createStubInstance(Channel);
-		channel.newDiscoveryService = sinon.stub().returns(discoveryService);
+		channel.newDiscoveryService.returns(discoveryService);
+
 		gateway = sinon.createStubInstance(Gateway);
 		gateway.identityContext = 'idx';
-		gateway.getOptions = sinon.stub().returns({
+		gateway.getOptions.returns({
 			transaction: 'options',
 			discovery: {
 				asLocalhost: true
 			}
 		});
+
 		network = new Network(gateway, channel);
+
 		transaction = sinon.createStubInstance(Transaction);
 		transaction.submit.resolves('result');
 		transaction.evaluate.resolves('result');
+
 		endorsement = sinon.createStubInstance(Endorsement);
-		endorsement.buildProposalInterest = sinon.stub().returns('interest');
-		discoveryService = sinon.createStubInstance(DiscoveryService);
-		discoveryService.newHandler = sinon.stub().returns('handler');
-		discoveryService.build = sinon.stub();
-		discoveryService.sign = sinon.stub();
-		discoveryService.send = sinon.stub().resolves();
+		endorsement.buildProposalInterest.returns('interest');
 
 		Contract.__set__('ContractEventListener', FakeListener);
 		contract = new Contract(network, chaincodeId, namespace, collections);