SocketProviderAdapter mock class renamed to SocketProvider and improv…

…ed and AbstractSubscriptionTest and LogSubscriptionTest updated.
web3 · Apr 26, 2019 · b9fe454 · b9fe454
1 parent 8be71d1
commit b9fe454
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/packages/web3-core-subscriptions/tests/__mocks__/SocketProvider.js b/packages/web3-core-subscriptions/tests/__mocks__/SocketProvider.js
@@ -0,0 +1,7 @@
+export default class SocketProvider {
+    constructor() {}
+    on() {}
+    once() {}
+    subscribe() {}
+    removeAllListeners() {}
+}
diff --git a/packages/web3-core-subscriptions/tests/__mocks__/SocketProviderAdapter.js b/packages/web3-core-subscriptions/tests/__mocks__/SocketProviderAdapter.js
diff --git a/packages/web3-core-subscriptions/tests/lib/subscriptions/AbstractSubscriptionTest.js b/packages/web3-core-subscriptions/tests/lib/subscriptions/AbstractSubscriptionTest.js
@@ -2,10 +2,12 @@ import * as Utils from 'web3-utils';
 import {formatters} from 'web3-core-helpers';
 import AbstractSubscription from '../../../lib/subscriptions/AbstractSubscription';
 import AbstractWeb3Module from '../../__mocks__/AbstractWeb3Module';
+import SocketProvider from '../../__mocks__/SocketProvider';
 
 // Mocks
 jest.mock('web3-utils');
 jest.mock('web3-core-helpers');
+jest.mock('../../__mocks__/SocketProvider');
 
 /**
  * AbstractSubscription test
@@ -15,7 +17,7 @@ describe('AbstractSubscriptionTest', () => {
 
     beforeEach(() => {
         moduleInstanceMock = new AbstractWeb3Module();
-        moduleInstanceMock.currentProvider.once = jest.fn();
+        moduleInstanceMock.currentProvider = new SocketProvider();
         moduleInstanceMock.currentProvider.subscribe = jest.fn((type, method, parameters) => {
             expect(type).toEqual(abstractSubscription.type);
 
@@ -63,8 +65,6 @@ describe('AbstractSubscriptionTest', () => {
     });
 
     it('calls subscribe and emits a error from the provider error listener', (done) => {
-        moduleInstanceMock.currentProvider.removeAllListeners = jest.fn();
-        moduleInstanceMock.currentProvider.on = jest.fn();
         moduleInstanceMock.currentProvider.once = jest.fn((event, callback) => {
             expect(event).toEqual('error');
 
@@ -83,7 +83,6 @@ describe('AbstractSubscriptionTest', () => {
     });
 
     it('calls subscribe and emits a error because of the provider subscribe method', (done) => {
-        moduleInstanceMock.currentProvider.removeAllListeners = jest.fn();
         moduleInstanceMock.currentProvider.subscribe = jest.fn(() => {
             return Promise.reject(new Error('ERROR'));
         });
@@ -98,7 +97,6 @@ describe('AbstractSubscriptionTest', () => {
     });
 
     it('calls subscribe and returns a error because of the provider subscribe method', (done) => {
-        moduleInstanceMock.currentProvider.removeAllListeners = jest.fn();
         moduleInstanceMock.currentProvider.subscribe = jest.fn(() => {
             return Promise.reject(new Error('ERROR'));
         });
@@ -111,8 +109,6 @@ describe('AbstractSubscriptionTest', () => {
     });
 
     it('calls subscribe and returns a error from the provider error listener', (done) => {
-        moduleInstanceMock.currentProvider.removeAllListeners = jest.fn();
-        moduleInstanceMock.currentProvider.on = jest.fn();
         moduleInstanceMock.currentProvider.once = jest.fn((event, callback) => {
             expect(event).toEqual('error');
 

diff --git a/packages/web3-core-subscriptions/tests/src/subscriptions/eth/LogSubscriptionTest.js b/packages/web3-core-subscriptions/tests/src/subscriptions/eth/LogSubscriptionTest.js
@@ -3,7 +3,7 @@ import {formatters} from 'web3-core-helpers';
 import LogSubscription from '../../../../src/subscriptions/eth/LogSubscription';
 import AbstractWeb3Module from '../../../__mocks__/AbstractWeb3Module';
 import GetPastLogsMethod from '../../../__mocks__/GetPastLogsMethod';
-import SocketProviderAdapter from '../../../__mocks__/SocketProviderAdapter';
+import SocketProvider from '../../../__mocks__/SocketProvider';
 
 // Mocks
 jest.mock('web3-utils');
@@ -13,11 +13,11 @@ jest.mock('web3-core-helpers');
  * LogSubscription test
  */
 describe('LogSubscriptionTest', () => {
-    let logSubscription, moduleInstanceMock, getPastLogsMethodMock, socketProviderAdapterMock;
+    let logSubscription, moduleInstanceMock, getPastLogsMethodMock, socketProviderMock;
 
     beforeEach(() => {
         moduleInstanceMock = new AbstractWeb3Module();
-        socketProviderAdapterMock = new SocketProviderAdapter();
+        socketProviderMock = new SocketProvider();
         getPastLogsMethodMock = new GetPastLogsMethod();
         getPastLogsMethodMock.execute = jest.fn();
 
@@ -45,7 +45,7 @@ describe('LogSubscriptionTest', () => {
 
         getPastLogsMethodMock.execute.mockReturnValueOnce(Promise.resolve([0]));
 
-        socketProviderAdapterMock.subscribe = jest.fn((type, method, parameters) => {
+        socketProviderMock.subscribe = jest.fn((type, method, parameters) => {
             expect(type).toEqual('eth_subscribe');
 
             expect(method).toEqual('logs');
@@ -55,13 +55,13 @@ describe('LogSubscriptionTest', () => {
             return Promise.resolve('MY_ID');
         });
 
-        socketProviderAdapterMock.on = jest.fn((subscriptionId, callback) => {
+        socketProviderMock.on = jest.fn((subscriptionId, callback) => {
             expect(subscriptionId).toEqual('MY_ID');
 
             callback(false, 'SUBSCRIPTION_ITEM');
         });
 
-        moduleInstanceMock.currentProvider = socketProviderAdapterMock;
+        moduleInstanceMock.currentProvider = socketProviderMock;
 
         let second = false;
         logSubscription.options.fromBlock = 0;
@@ -124,7 +124,7 @@ describe('LogSubscriptionTest', () => {
     it('calls subscribe and calls the callback once', (done) => {
         formatters.outputLogFormatter.mockReturnValueOnce('ITEM');
 
-        socketProviderAdapterMock.subscribe = jest.fn((type, method, parameters) => {
+        socketProviderMock.subscribe = jest.fn((type, method, parameters) => {
             expect(type).toEqual('eth_subscribe');
 
             expect(method).toEqual('logs');
@@ -134,13 +134,13 @@ describe('LogSubscriptionTest', () => {
             return Promise.resolve('MY_ID');
         });
 
-        socketProviderAdapterMock.on = jest.fn((subscriptionId, callback) => {
+        socketProviderMock.on = jest.fn((subscriptionId, callback) => {
             expect(subscriptionId).toEqual('MY_ID');
 
             callback(false, 'SUBSCRIPTION_ITEM');
         });
 
-        moduleInstanceMock.currentProvider = socketProviderAdapterMock;
+        moduleInstanceMock.currentProvider = socketProviderMock;
 
         const subscription = logSubscription.subscribe((error, response) => {
             expect(error).toEqual(false);
@@ -158,11 +158,11 @@ describe('LogSubscriptionTest', () => {
     it('calls subscribe and it returns with an Subscription object that calls the callback with an error', (done) => {
         formatters.inputLogFormatter.mockReturnValueOnce({});
 
-        socketProviderAdapterMock.subscribe = jest.fn(() => {
+        socketProviderMock.subscribe = jest.fn(() => {
             return Promise.reject(new Error('ERROR'));
         });
 
-        moduleInstanceMock.currentProvider = socketProviderAdapterMock;
+        moduleInstanceMock.currentProvider = socketProviderMock;
 
         expect(
             logSubscription.subscribe((error, response) => {