Fix mock tests (dep upgrade)

This commit is contained in:
Jaco Greeff
2018-08-16 13:25:21 +02:00
parent 6877262b22
commit 137468d4a5
3 changed files with 19 additions and 22 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
// This software may be modified and distributed under the terms
// of the ISC license. See the LICENSE file for details.
import E3 from 'eventemitter3';
import EventEmitter from 'eventemitter3';
import { Logger } from '@polkadot/util/types';
export type MockState$Subscription$Callback = (error: Error | null, value: any) => void;
@@ -25,7 +25,7 @@ export type MockState$Requests = {
};
export type MockState = {
emitter: E3.EventEmitter,
emitter: EventEmitter,
l: Logger,
requests: MockState$Requests,
storage: MockState$Storage,
-9
View File
@@ -1,9 +0,0 @@
declare module 'mock-socket' {
export class Server {
constructor (url: string);
on (event: 'message', body: {}): void;
send (message: string): void;
stop (): void;
}
}
+17 -11
View File
@@ -50,22 +50,28 @@ function mockWs (requests: Array<{ method: string }>) {
body: {},
requests: 0,
server,
done: () => server.stop()
done: () =>
server.stop(() => {
// ignore
})
};
server.on('message', (body: {}) => {
const request = requests[requestCount];
// @ts-ignore Yes, SHOULD be fixed, this is a mess
const response = request.error
server.on('connection', (socket) => {
// @ts-ignore definitions are wrong, this is 'on', not 'onmessage'
socket.on('message', (body: {}) => {
const request = requests[requestCount];
// @ts-ignore Yes, SHOULD be fixed, this is a mess
? createError(request)
// @ts-ignore Yes, SHOULD be fixed, this is a mess
: createReply(request);
const response = request.error
// @ts-ignore Yes, SHOULD be fixed, this is a mess
? createError(request)
// @ts-ignore Yes, SHOULD be fixed, this is a mess
: createReply(request);
scope.body[request.method] = body;
requestCount++;
scope.body[request.method] = body;
requestCount++;
server.send(JSON.stringify(response));
socket.send(JSON.stringify(response));
});
});
return scope;