Skip to content

Commit b15a071

Browse files
dynstdynst
committed
socket: delete pending() calls from jasmine tests
1 parent c627525 commit b15a071

File tree

4 files changed

+15
-72
lines changed

4 files changed

+15
-72
lines changed

‎packages/socket/src/queueingstreamingsocket.spec.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import { ConnectionStatus, QueueingStreamingSocket } from "./queueingstreamingsocket";
22

3-
function pendingWithoutSocketServer(): void {
4-
if (typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED) {
5-
return;
6-
}
7-
pending("Set SOCKETSERVER_ENABLED to enable socket tests");
8-
}
3+
const enabled = typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED;
94

105
describe("QueueingStreamingSocket", () => {
116
const socketServerUrl = "ws://localhost:4444/websocket";
@@ -15,14 +10,13 @@ describe("QueueingStreamingSocket", () => {
1510
expect(socket).toBeTruthy();
1611
});
1712

18-
describe("queueRequest", () => {
13+
(enabled ? describe : xdescribe)("queueRequest", () => {
1914
it("can queue and process requests with a connection", async () => {
2015
let done!: (() => void) & { fail: (e?: any) => void };
2116
const ret = new Promise<void>((resolve, reject) => {
2217
done = resolve as typeof done;
2318
done.fail = reject;
2419
});
25-
pendingWithoutSocketServer();
2620
const socket = new QueueingStreamingSocket(socketServerUrl);
2721
const requests = ["request 1", "request 2", "request 3"] as const;
2822
let eventsSeen = 0;
@@ -51,7 +45,6 @@ describe("QueueingStreamingSocket", () => {
5145
done = resolve as typeof done;
5246
done.fail = reject;
5347
});
54-
pendingWithoutSocketServer();
5548
const socket = new QueueingStreamingSocket(socketServerUrl);
5649
const requests = ["request 1", "request 2", "request 3"] as const;
5750
let eventsSeen = 0;
@@ -78,14 +71,13 @@ describe("QueueingStreamingSocket", () => {
7871
});
7972
});
8073

81-
describe("reconnect", () => {
74+
(enabled ? describe : xdescribe)("reconnect", () => {
8275
it("does not emit a completed event when disconnected", async () => {
8376
let done!: (() => void) & { fail: (e?: any) => void };
8477
const ret = new Promise<void>((resolve, reject) => {
8578
done = resolve as typeof done;
8679
done.fail = reject;
8780
});
88-
pendingWithoutSocketServer();
8981
const request = "request";
9082
const socket = new QueueingStreamingSocket(socketServerUrl);
9183
socket.events.subscribe({
@@ -114,7 +106,6 @@ describe("QueueingStreamingSocket", () => {
114106
done = resolve as typeof done;
115107
done.fail = reject;
116108
});
117-
pendingWithoutSocketServer();
118109
const socket = new QueueingStreamingSocket(socketServerUrl);
119110
const requests = ["request 1", "request 2", "request 3"] as const;
120111
let eventsSeen = 0;
@@ -147,7 +138,6 @@ describe("QueueingStreamingSocket", () => {
147138
done = resolve as typeof done;
148139
done.fail = reject;
149140
});
150-
pendingWithoutSocketServer();
151141
const socket = new QueueingStreamingSocket(socketServerUrl, undefined, done);
152142

153143
socket.reconnect();
@@ -163,7 +153,6 @@ describe("QueueingStreamingSocket", () => {
163153
done = resolve as typeof done;
164154
done.fail = reject;
165155
});
166-
pendingWithoutSocketServer();
167156
const socket = new QueueingStreamingSocket(socketServerUrl);
168157
let statusChangesSeen = 0;
169158
socket.connectionStatus.updates.subscribe({

‎packages/socket/src/reconnectingsocket.spec.ts‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ type Exec = (command: string, callback: (error: null | (Error & { readonly code?
55

66
const getExec = async (): Promise<Exec | undefined> => (await import("child_process")).exec;
77

8-
function pendingWithoutSocketServer(): void {
9-
if (typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED) {
10-
return;
11-
}
12-
pending("Set SOCKETSERVER_ENABLED to enable socket tests");
13-
}
8+
const enabled = typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED;
149

1510
describe("ReconnectingSocket", () => {
1611
const socketServerUrl = "ws://localhost:4444/websocket";
@@ -20,14 +15,13 @@ describe("ReconnectingSocket", () => {
2015
expect(socket).toBeTruthy();
2116
});
2217

23-
describe("connect", () => {
18+
(enabled ? describe : xdescribe)("connect", () => {
2419
it("cannot connect after being connected", async () => {
2520
let done!: (() => void) & { fail: (e?: any) => void };
2621
const ret = new Promise<void>((resolve, reject) => {
2722
done = resolve as typeof done;
2823
done.fail = reject;
2924
});
30-
pendingWithoutSocketServer();
3125
const socket = new ReconnectingSocket(socketServerUrl);
3226
// Necessary otherwise the producer doesn’t start
3327
socket.events.subscribe({});
@@ -45,14 +39,13 @@ describe("ReconnectingSocket", () => {
4539
});
4640
});
4741

48-
describe("disconnect", () => {
42+
(enabled ? describe : xdescribe)("disconnect", () => {
4943
it("ends the events stream", async () => {
5044
let done!: (() => void) & { fail: (e?: any) => void };
5145
const ret = new Promise<void>((resolve, reject) => {
5246
done = resolve as typeof done;
5347
done.fail = reject;
5448
});
55-
pendingWithoutSocketServer();
5649
const socket = new ReconnectingSocket(socketServerUrl);
5750
socket.events.subscribe({
5851
complete: done,
@@ -73,7 +66,6 @@ describe("ReconnectingSocket", () => {
7366
done = resolve as typeof done;
7467
done.fail = reject;
7568
});
76-
pendingWithoutSocketServer();
7769
const socket = new ReconnectingSocket(socketServerUrl);
7870
// Necessary otherwise the producer doesn’t start
7971
socket.events.subscribe({});
@@ -92,7 +84,6 @@ describe("ReconnectingSocket", () => {
9284
});
9385

9486
it("can disconnect without waiting for open", () => {
95-
pendingWithoutSocketServer();
9687
const socket = new ReconnectingSocket(socketServerUrl);
9788
expect(() => {
9889
socket.connect();
@@ -101,7 +92,7 @@ describe("ReconnectingSocket", () => {
10192
});
10293
});
10394

104-
describe("reconnection", () => {
95+
(enabled ? describe : xdescribe)("reconnection", () => {
10596
const dirPath = "../../scripts/socketserver";
10697
const codePkillNoProcessesMatched = 1;
10798
const startServerCmd = `${dirPath}/start.sh`;
@@ -116,12 +107,9 @@ describe("ReconnectingSocket", () => {
116107

117108
const exec = await getExec();
118109
if (exec === undefined) {
119-
pending("Run test in an environment which supports child processes to enable socket tests");
120-
return;
110+
throw new Error("Socket test was enabled in an environment without child processes!");
121111
}
122112

123-
pendingWithoutSocketServer();
124-
125113
exec(stopServerCmd, (stopError) => {
126114
if (stopError && stopError.code !== codePkillNoProcessesMatched) {
127115
fail(stopError);
@@ -170,12 +158,9 @@ describe("ReconnectingSocket", () => {
170158

171159
const exec = await getExec();
172160
if (exec === undefined) {
173-
pending("Run test in an environment which supports child processes to enable socket tests");
174-
return;
161+
throw new Error("Socket test was enabled in an environment without child processes!");
175162
}
176163

177-
pendingWithoutSocketServer();
178-
179164
const socket = new ReconnectingSocket(socketServerUrl);
180165
const requests = ["request 1", "request 2", "request 3"] as const;
181166
let eventsSeen = 0;

‎packages/socket/src/socketwrapper.spec.ts‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import { SocketWrapper } from "./socketwrapper";
22

3-
function pendingWithoutSocketServer(): void {
4-
if (typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED) {
5-
return;
6-
}
7-
pending("Set SOCKETSERVER_ENABLED to enable socket tests");
8-
}
9-
10-
describe("SocketWrapper", () => {
3+
const enabled = typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED;
4+
5+
(enabled ? describe : xdescribe)("SocketWrapper", () => {
116
const socketServerUrlNonExisting = "ws://localhost:4443/websocket";
127
const socketServerUrl = "ws://localhost:4444/websocket";
138
const socketServerUrlSlow = "ws://localhost:4445/websocket";
@@ -27,7 +22,6 @@ describe("SocketWrapper", () => {
2722
done = resolve as typeof done;
2823
done.fail = reject;
2924
});
30-
pendingWithoutSocketServer();
3125

3226
const socket = new SocketWrapper(
3327
socketServerUrl,
@@ -54,7 +48,6 @@ describe("SocketWrapper", () => {
5448
done = resolve as typeof done;
5549
done.fail = reject;
5650
});
57-
pendingWithoutSocketServer();
5851

5952
const socket = new SocketWrapper(
6053
socketServerUrlNonExisting,
@@ -84,7 +77,6 @@ describe("SocketWrapper", () => {
8477
done = resolve as typeof done;
8578
done.fail = reject;
8679
});
87-
pendingWithoutSocketServer();
8880
const timeout = 1200; // ms
8981

9082
const socket = new SocketWrapper(
@@ -116,7 +108,6 @@ describe("SocketWrapper", () => {
116108
done = resolve as typeof done;
117109
done.fail = reject;
118110
});
119-
pendingWithoutSocketServer();
120111

121112
const socket = new SocketWrapper(
122113
socketServerUrlSlow,
@@ -138,8 +129,6 @@ describe("SocketWrapper", () => {
138129
});
139130

140131
it("times out when establishing connection takes too long", async () => {
141-
pendingWithoutSocketServer();
142-
143132
const socket = new SocketWrapper(
144133
socketServerUrlSlow,
145134
() => {
@@ -173,7 +162,6 @@ describe("SocketWrapper", () => {
173162
done = resolve as typeof done;
174163
done.fail = reject;
175164
});
176-
pendingWithoutSocketServer();
177165

178166
let opened = 0;
179167

@@ -208,7 +196,6 @@ describe("SocketWrapper", () => {
208196
done = resolve as typeof done;
209197
done.fail = reject;
210198
});
211-
pendingWithoutSocketServer();
212199

213200
const socket = new SocketWrapper(
214201
socketServerUrl,
@@ -239,7 +226,6 @@ describe("SocketWrapper", () => {
239226
done = resolve as typeof done;
240227
done.fail = reject;
241228
});
242-
pendingWithoutSocketServer();
243229
const timeout = 500; // ms
244230

245231
const socket = new SocketWrapper(
@@ -274,7 +260,6 @@ describe("SocketWrapper", () => {
274260
done = resolve as typeof done;
275261
done.fail = reject;
276262
});
277-
pendingWithoutSocketServer();
278263

279264
const responseMessages = new Array<string>();
280265

@@ -312,7 +297,6 @@ describe("SocketWrapper", () => {
312297
done = resolve as typeof done;
313298
done.fail = reject;
314299
});
315-
pendingWithoutSocketServer();
316300

317301
// The "timeout period" is the period in which a timeout could potentially be triggered
318302

@@ -347,7 +331,6 @@ describe("SocketWrapper", () => {
347331
done = resolve as typeof done;
348332
done.fail = reject;
349333
});
350-
pendingWithoutSocketServer();
351334

352335
const socket = new SocketWrapper(
353336
socketServerUrl,

‎packages/socket/src/streamingsocket.spec.ts‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@ import { toListPromise } from "@cosmjs/stream";
22

33
import { StreamingSocket } from "./streamingsocket";
44

5-
function pendingWithoutSocketServer(): void {
6-
if (typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED) {
7-
return;
8-
}
9-
pending("Set SOCKETSERVER_ENABLED to enable socket tests");
10-
}
11-
12-
describe("StreamingSocket", () => {
5+
const enabled = typeof process !== "undefined" && process?.env.SOCKETSERVER_ENABLED;
6+
7+
(enabled ? describe : xdescribe)("StreamingSocket", () => {
138
const socketServerUrl = "ws://localhost:4444/websocket";
149
const socketServerUrlSlow = "ws://localhost:4445/websocket";
1510

@@ -19,8 +14,6 @@ describe("StreamingSocket", () => {
1914
});
2015

2116
it("can connect", async () => {
22-
pendingWithoutSocketServer();
23-
2417
const socket = new StreamingSocket(socketServerUrl);
2518
expect(socket).toBeTruthy();
2619
socket.connect();
@@ -29,8 +22,6 @@ describe("StreamingSocket", () => {
2922
});
3023

3124
it("can connect to slow server", async () => {
32-
pendingWithoutSocketServer();
33-
3425
const socket = new StreamingSocket(socketServerUrlSlow);
3526
expect(socket).toBeTruthy();
3627
socket.connect();
@@ -39,8 +30,6 @@ describe("StreamingSocket", () => {
3930
});
4031

4132
it("times out when establishing connection takes too long", async () => {
42-
pendingWithoutSocketServer();
43-
4433
const socket = new StreamingSocket(socketServerUrlSlow, 2_000);
4534
socket.connect();
4635

@@ -54,8 +43,6 @@ describe("StreamingSocket", () => {
5443
});
5544

5645
it("can send events when connected", async () => {
57-
pendingWithoutSocketServer();
58-
5946
const socket = new StreamingSocket(socketServerUrl);
6047

6148
const responsePromise = toListPromise(socket.events, 3);
@@ -79,7 +66,6 @@ describe("StreamingSocket", () => {
7966
done = resolve as typeof done;
8067
done.fail = reject;
8168
});
82-
pendingWithoutSocketServer();
8369

8470
const socket = new StreamingSocket(socketServerUrl);
8571
expect(socket).toBeTruthy();

0 commit comments

Comments
 (0)