Skip to content

Commit 77ff88b

Browse files
committed
update
1 parent 85287f7 commit 77ff88b

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

src/communication/WebSocketSubscriber.test.ts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,24 @@ import { verify, instance, mock, anything } from '../../node_modules/ts-mockito/
99
import { WebSocketWrapper } from '../../src/communication/WebSocketWrapper';
1010

1111
describe('Test xcWebSocketSubscriber module', function() {
12+
let mockServer: Server | undefined;
1213
beforeEach(function() {
1314
// tslint:disable-next-line:no-any
1415
(<any>window).WebSocket = WebSocket;
1516
// tslint:disable-next-line:no-any
1617
(<any>window).isTestEnvironnement = true;
1718
});
1819

20+
21+
afterEach(() => {
22+
if (mockServer) {
23+
mockServer.close();
24+
mockServer = undefined;
25+
}
26+
});
27+
1928
describe('Test subscribe method', function() {
20-
let subscriber, mockServer: Server, mockWebSocket;
29+
let subscriber, mockWebSocket;
2130
beforeEach(function() {
2231
let serverUrl = 'wss://' + generateUUID();
2332
mockServer = new Server(serverUrl);
@@ -38,14 +47,14 @@ describe('Test xcWebSocketSubscriber module', function() {
3847
expect(data.stateMachineRef.StateName).toEqual(Mock.correctReceivedData.stateMachineRef.StateName);
3948
expect(data.stateMachineRef.send).toEqual(expect.any(Function));
4049
expect(data.jsonMessage).toEqual(Mock.correctReceivedData.jsonMessage);
41-
mockServer.stop(done);
50+
mockServer?.stop(done);
4251
};
4352
// subscribe send a message (subscribe request)
4453
subscriber.subscribe('component', 'stateMachine', { onStateMachineUpdate: stateMachineUpdateListener });
4554
};
4655

4756
// tslint:disable-next-line:no-any
48-
mockServer.on('connection', function(server: any) {
57+
mockServer?.on('connection', function(server: any) {
4958
// when subscribe request is received, we send send jsonData
5059
// tslint:disable-next-line:no-any
5160
server.on('message', function(subscribeRequest: any) {
@@ -103,7 +112,7 @@ describe('Test xcWebSocketSubscriber module', function() {
103112
});
104113

105114
describe('Test getSnapshot method', function() {
106-
let subscriber, mockServer: Server, mockWebSocket, privateTopics;
115+
let subscriber, mockWebSocket, privateTopics;
107116
beforeEach(function() {
108117
let serverUrl = 'wss://' + generateUUID();
109118
mockServer = new Server(serverUrl);
@@ -117,7 +126,7 @@ describe('Test xcWebSocketSubscriber module', function() {
117126
let deserializer = new Deserializer();
118127

119128
// tslint:disable-next-line:no-any
120-
mockServer.on('connection', function(server: any) {
129+
mockServer?.on('connection', function(server: any) {
121130
let n = -3;
122131
let topic: string = '';
123132

@@ -164,7 +173,7 @@ describe('Test xcWebSocketSubscriber module', function() {
164173
mockWebSocket.onopen = function() {
165174
subscriber
166175
.getSnapshot('component', 'stateMachine', privateTopics)
167-
.then(items => mockServer.stop(done))
176+
.then(items => mockServer?.stop(done))
168177
.catch(err => {
169178
console.error(err);
170179
});

0 commit comments

Comments
 (0)