Skip to content

Commit

Permalink
Merge branch 'beta' into chore/bump-contract-wrappers-beta-61
Browse files Browse the repository at this point in the history
  • Loading branch information
monitz87 committed Jan 31, 2020
2 parents 3519fcb + 4938ff1 commit db92ba4
Show file tree
Hide file tree
Showing 6 changed files with 734 additions and 37 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "@polymathnetwork/sdk",
"version": "2.0.1-beta.117",
"version": "2.0.1-beta.118",
"description": "A Javascript SDK for interacting with the Polymath network for the browser and Node.js",
"bugs": {
"url": "https://github.com/PolymathNetwork/polymath-sdk/issues"
Expand Down
46 changes: 11 additions & 35 deletions src/procedures/__tests__/ModifyDividendsDefaultExclusionList.ts
@@ -1,3 +1,4 @@
/* eslint-disable import/no-duplicates */
import { ImportMock, MockManager } from 'ts-mock-imports';
import { spy, restore } from 'sinon';
import * as contractWrappersModule from '@polymathnetwork/contract-wrappers';
Expand All @@ -22,32 +23,18 @@ describe('ModifyDividendsDefaultExclusionList', () => {
let target: ModifyDividendsDefaultExclusionList;
let contextMock: MockManager<contextModule.Context>;
let wrappersMock: MockManager<wrappersModule.PolymathBase>;
let tokenFactoryMock: MockManager<
tokenFactoryModule.MockedTokenFactoryModule
>;
let securityTokenMock: MockManager<
contractWrappersModule.SecurityToken_3_0_0
>;
let erc20DividendsMock: MockManager<
contractWrappersModule.ERC20DividendCheckpoint_3_0_0
>;
let dividendFactoryMock: MockManager<
dividendFactoryModule.DividendDistributionFactory
>;
let tokenFactoryMock: MockManager<tokenFactoryModule.MockedTokenFactoryModule>;
let securityTokenMock: MockManager<contractWrappersModule.SecurityToken_3_0_0>;
let erc20DividendsMock: MockManager<contractWrappersModule.ERC20DividendCheckpoint_3_0_0>;
let dividendFactoryMock: MockManager<dividendFactoryModule.DividendDistributionFactory>;
let factoriesMockedSetup: Factories;

beforeEach(() => {
// Mock the context, wrappers, tokenFactory and securityToken to test ModifyDividendsDefaultExclusionList
contextMock = ImportMock.mockClass(contextModule, 'Context');
wrappersMock = ImportMock.mockClass(wrappersModule, 'PolymathBase');
tokenFactoryMock = ImportMock.mockClass(
tokenFactoryModule,
'MockedTokenFactoryModule'
);
securityTokenMock = ImportMock.mockClass(
contractWrappersModule,
'SecurityToken_3_0_0'
);
tokenFactoryMock = ImportMock.mockClass(tokenFactoryModule, 'MockedTokenFactoryModule');
securityTokenMock = ImportMock.mockClass(contractWrappersModule, 'SecurityToken_3_0_0');
erc20DividendsMock = ImportMock.mockClass(
contractWrappersModule,
'ERC20DividendCheckpoint_3_0_0'
Expand All @@ -65,14 +52,8 @@ describe('ModifyDividendsDefaultExclusionList', () => {
factoriesMockedSetup = mockFactories();
factoriesMockedSetup.dividendDistributionFactory = dividendFactoryMock.getMockInstance();
contextMock.set('factories', factoriesMockedSetup);
contextMock.set(
'currentWallet',
new Wallet({ address: () => Promise.resolve('0x01') })
);
target = new ModifyDividendsDefaultExclusionList(
params,
contextMock.getMockInstance()
);
contextMock.set('currentWallet', new Wallet({ address: () => Promise.resolve('0x01') }));
target = new ModifyDividendsDefaultExclusionList(params, contextMock.getMockInstance());
});

afterEach(() => {
Expand All @@ -82,9 +63,7 @@ describe('ModifyDividendsDefaultExclusionList', () => {
describe('Types', () => {
test('should extend procedure and have ModifyDividendsDefaultExclusionList type', async () => {
expect(target instanceof Procedure).toBe(true);
expect(target.type).toBe(
ProcedureType.ModifyDividendsDefaultExclusionList
);
expect(target.type).toBe(ProcedureType.ModifyDividendsDefaultExclusionList);
});
});

Expand Down Expand Up @@ -121,10 +100,7 @@ describe('ModifyDividendsDefaultExclusionList', () => {
Promise.resolve([erc20DividendsMock.getMockInstance()])
);

erc20DividendsMock.mock(
'setDefaultExcluded',
Promise.resolve('SetDefaultExcluded')
);
erc20DividendsMock.mock('setDefaultExcluded', Promise.resolve('SetDefaultExcluded'));

const addTransactionSpy = spy(target, 'addTransaction');

Expand Down
1 change: 1 addition & 0 deletions src/procedures/__tests__/PullDividendPayment.ts
@@ -1,3 +1,4 @@
/* eslint-disable import/no-duplicates */
import { ImportMock, MockManager } from 'ts-mock-imports';
import { spy, restore } from 'sinon';
import * as contractWrappersModule from '@polymathnetwork/contract-wrappers';
Expand Down

0 comments on commit db92ba4

Please sign in to comment.