fix: fixes requested by jere

PolymeshAssociation · Mar 31, 2020 · 78a45c3 · 78a45c3
1 parent e037840
commit 78a45c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/api/procedures/__tests__/toggleFreezeTransfers.ts b/src/api/procedures/__tests__/toggleFreezeTransfers.ts
@@ -23,7 +23,6 @@ describe('toggleFreezeTransfers procedure', () => {
   let stringToTickerStub: sinon.SinonStub<[string, Context], Ticker>;
   let ticker: string;
   let rawTicker: Ticker;
-  let procedureResult: SecurityToken;
 
   beforeAll(() => {
     polkadotMockUtils.initMocks();
@@ -32,13 +31,12 @@ describe('toggleFreezeTransfers procedure', () => {
     stringToTickerStub = sinon.stub(utilsModule, 'stringToTicker');
     ticker = 'someTicker';
     rawTicker = polkadotMockUtils.createMockTicker(ticker);
-    procedureResult = entityMockUtils.getSecurityTokenInstance();
   });
 
   let addTransactionStub: sinon.SinonStub;
 
   beforeEach(() => {
-    addTransactionStub = procedureMockUtils.getAddTransactionStub().returns([procedureResult]);
+    addTransactionStub = procedureMockUtils.getAddTransactionStub();
     mockContext = polkadotMockUtils.getContextInstance();
     stringToTickerStub.withArgs(ticker, mockContext).returns(rawTicker);
   });
@@ -59,7 +57,6 @@ describe('toggleFreezeTransfers procedure', () => {
     entityMockUtils.initMocks({
       securityTokenOptions: {
         transfersAreFrozen: true,
-        ticker,
       },
     });
 
@@ -77,7 +74,7 @@ describe('toggleFreezeTransfers procedure', () => {
   test('should throw an error if freeze is set to false and the security token is already unfrozen', () => {
     entityMockUtils.initMocks({
       securityTokenOptions: {
-        ticker,
+        transfersAreFrozen: false,
       },
     });
 
@@ -105,14 +102,13 @@ describe('toggleFreezeTransfers procedure', () => {
 
     sinon.assert.calledWith(addTransactionStub, transaction, {}, rawTicker);
 
-    expect(result.ticker).toBe(procedureResult.ticker);
+    expect(ticker).toBe(result.ticker);
   });
 
   test('should add a unfreeze transaction to the queue', async () => {
     entityMockUtils.initMocks({
       securityTokenOptions: {
         transfersAreFrozen: true,
-        ticker,
       },
     });
 
@@ -128,7 +124,7 @@ describe('toggleFreezeTransfers procedure', () => {
 
     sinon.assert.calledWith(addTransactionStub, transaction, {}, rawTicker);
 
-    expect(result.ticker).toBe(procedureResult.ticker);
+    expect(ticker).toBe(result.ticker);
   });
 });
 

diff --git a/src/testUtils/mocks/entities.ts b/src/testUtils/mocks/entities.ts
@@ -54,17 +54,17 @@ const MockIdentityClass = class {
   /**
    * @hidden
    */
-  constructor() {
-    return identityConstructorStub();
+  constructor(...args: unknown[]) {
+    return identityConstructorStub(...args);
   }
 };
 
 const MockTickerReservationClass = class {
   /**
    * @hidden
    */
-  constructor() {
-    return tickerReservationConstructorStub();
+  constructor(...args: unknown[]) {
+    return tickerReservationConstructorStub(...args);
   }
 };
 
@@ -170,7 +170,9 @@ function initTickerReservation(opts?: TickerReservationOptions): void {
   } as unknown) as MockTickerReservation;
 
   Object.assign(mockInstanceContainer.tickerReservation, tickerReservation);
-  tickerReservationConstructorStub.returns(tickerReservation);
+  tickerReservationConstructorStub.callsFake(args => {
+    return merge({}, tickerReservation, args);
+  });
 }
 
 /**
@@ -193,7 +195,9 @@ function initIdentity(opts?: IdentityOptions): void {
   } as unknown) as MockIdentity;
 
   Object.assign(mockInstanceContainer.identity, identity);
-  identityConstructorStub.returns(identity);
+  identityConstructorStub.callsFake(args => {
+    return merge({}, identity, args);
+  });
 }
 
 /**