Skip to content

Commit 1e9b4b4

Browse files
webmaster128webmaster128
authored
Merge pull request #1835 from dynst/jasmine-xdescribe
use top level xdescribe() call
2 parents c64847d + ef856b1 commit 1e9b4b4

File tree

3 files changed

+111
-126
lines changed

3 files changed

+111
-126
lines changed

‎packages/tendermint-rpc/src/comet38/comet38client.spec.ts‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -252,27 +252,25 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
252252

253253
describe("blockSearch", () => {
254254
beforeAll(async () => {
255-
if (tendermintEnabled) {
256-
const client = Comet38Client.create(rpcFactory());
255+
const client = Comet38Client.create(rpcFactory());
257256

258-
async function sendTx(): Promise<void> {
259-
const tx = buildKvTx(randomString(), randomString());
257+
async function sendTx(): Promise<void> {
258+
const tx = buildKvTx(randomString(), randomString());
260259

261-
const txRes = await client.broadcastTxCommit({ tx: tx });
262-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
263-
expect(txRes.height).toBeTruthy();
264-
expect(txRes.hash.length).not.toEqual(0);
265-
}
260+
const txRes = await client.broadcastTxCommit({ tx: tx });
261+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
262+
expect(txRes.height).toBeTruthy();
263+
expect(txRes.hash.length).not.toEqual(0);
264+
}
266265

267-
// send 3 txs
268-
await sendTx();
269-
await sendTx();
270-
await sendTx();
266+
// send 3 txs
267+
await sendTx();
268+
await sendTx();
269+
await sendTx();
271270

272-
client.disconnect();
271+
client.disconnect();
273272

274-
await tendermintSearchIndexUpdated();
275-
}
273+
await tendermintSearchIndexUpdated();
276274
});
277275

278276
it("can paginate over blockSearch results", async () => {
@@ -435,29 +433,27 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
435433
let broadcast1: responses.BroadcastTxCommitResponse | undefined;
436434

437435
beforeAll(async () => {
438-
if (tendermintEnabled) {
439-
const client = Comet38Client.create(rpcFactory());
440-
441-
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
442-
const me = randomString();
443-
const tx = buildKvTx(txKey, me);
444-
445-
const txRes = await client.broadcastTxCommit({ tx: tx });
446-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
447-
expect(txRes.height).toBeTruthy();
448-
expect(txRes.hash.length).toEqual(32);
449-
return [tx, txRes];
450-
}
451-
452-
// send 3 txs
453-
[tx1, broadcast1] = await sendTx();
454-
await sendTx();
455-
await sendTx();
436+
const client = Comet38Client.create(rpcFactory());
456437

457-
client.disconnect();
438+
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
439+
const me = randomString();
440+
const tx = buildKvTx(txKey, me);
458441

459-
await tendermintSearchIndexUpdated();
442+
const txRes = await client.broadcastTxCommit({ tx: tx });
443+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
444+
expect(txRes.height).toBeTruthy();
445+
expect(txRes.hash.length).toEqual(32);
446+
return [tx, txRes];
460447
}
448+
449+
// send 3 txs
450+
[tx1, broadcast1] = await sendTx();
451+
await sendTx();
452+
await sendTx();
453+
454+
client.disconnect();
455+
456+
await tendermintSearchIndexUpdated();
461457
});
462458

463459
it("finds a single tx by hash", async () => {
@@ -851,10 +847,10 @@ function websocketTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValue
851847
});
852848
}
853849

854-
describe("Comet38Client with CometBFT 0.38 backend", () => {
850+
(tendermintEnabled ? describe : xdescribe)("Comet38Client with CometBFT 0.38 backend", () => {
855851
const { url, expected } = tendermintInstances[38];
856852

857-
(tendermintEnabled ? it : xit)("can connect to a given url", async () => {
853+
it("can connect to a given url", async () => {
858854
// http connection
859855
{
860856
const client = await Comet38Client.connect("http://" + url);
@@ -872,14 +868,13 @@ describe("Comet38Client with CometBFT 0.38 backend", () => {
872868
}
873869
});
874870

875-
(tendermintEnabled ? describe : xdescribe)("With HttpClient", () => {
871+
describe("With HttpClient", () => {
876872
defaultTestSuite(() => new HttpClient("http://" + url), expected);
877873
});
878874

879-
(tendermintEnabled ? describe : xdescribe)("With WebsocketClient", () => {
875+
describe("With WebsocketClient", () => {
880876
// don't print out WebSocket errors if marked pending
881-
const onError = globalThis.process?.env.TENDERMINT_ENABLED ? console.error : () => 0;
882-
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, onError);
877+
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, console.error);
883878
defaultTestSuite(factory, expected);
884879
websocketTestSuite(factory, expected);
885880
});

‎packages/tendermint-rpc/src/tendermint34/tendermint34client.spec.ts‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -260,27 +260,25 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
260260

261261
describe("blockSearch", () => {
262262
beforeAll(async () => {
263-
if (tendermintEnabled) {
264-
const client = Tendermint34Client.create(rpcFactory());
263+
const client = Tendermint34Client.create(rpcFactory());
265264

266-
async function sendTx(): Promise<void> {
267-
const tx = buildKvTx(randomString(), randomString());
265+
async function sendTx(): Promise<void> {
266+
const tx = buildKvTx(randomString(), randomString());
268267

269-
const txRes = await client.broadcastTxCommit({ tx: tx });
270-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
271-
expect(txRes.height).toBeTruthy();
272-
expect(txRes.hash.length).not.toEqual(0);
273-
}
268+
const txRes = await client.broadcastTxCommit({ tx: tx });
269+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
270+
expect(txRes.height).toBeTruthy();
271+
expect(txRes.hash.length).not.toEqual(0);
272+
}
274273

275-
// send 3 txs
276-
await sendTx();
277-
await sendTx();
278-
await sendTx();
274+
// send 3 txs
275+
await sendTx();
276+
await sendTx();
277+
await sendTx();
279278

280-
client.disconnect();
279+
client.disconnect();
281280

282-
await tendermintSearchIndexUpdated();
283-
}
281+
await tendermintSearchIndexUpdated();
284282
});
285283

286284
it("can paginate over blockSearch results", async () => {
@@ -442,29 +440,27 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
442440
let broadcast1: responses.BroadcastTxCommitResponse | undefined;
443441

444442
beforeAll(async () => {
445-
if (tendermintEnabled) {
446-
const client = Tendermint34Client.create(rpcFactory());
447-
448-
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
449-
const me = randomString();
450-
const tx = buildKvTx(txKey, me);
451-
452-
const txRes = await client.broadcastTxCommit({ tx: tx });
453-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
454-
expect(txRes.height).toBeTruthy();
455-
expect(txRes.hash.length).toEqual(32);
456-
return [tx, txRes];
457-
}
458-
459-
// send 3 txs
460-
[tx1, broadcast1] = await sendTx();
461-
await sendTx();
462-
await sendTx();
443+
const client = Tendermint34Client.create(rpcFactory());
463444

464-
client.disconnect();
445+
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
446+
const me = randomString();
447+
const tx = buildKvTx(txKey, me);
465448

466-
await tendermintSearchIndexUpdated();
449+
const txRes = await client.broadcastTxCommit({ tx: tx });
450+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
451+
expect(txRes.height).toBeTruthy();
452+
expect(txRes.hash.length).toEqual(32);
453+
return [tx, txRes];
467454
}
455+
456+
// send 3 txs
457+
[tx1, broadcast1] = await sendTx();
458+
await sendTx();
459+
await sendTx();
460+
461+
client.disconnect();
462+
463+
await tendermintSearchIndexUpdated();
468464
});
469465

470466
it("finds a single tx by hash", async () => {
@@ -846,10 +842,10 @@ function websocketTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValue
846842
});
847843
}
848844

849-
describe("Tendermint34Client", () => {
845+
(tendermintEnabled ? describe : xdescribe)("Tendermint34Client", () => {
850846
const { url, expected } = tendermintInstances[34];
851847

852-
(tendermintEnabled ? it : xit)("can connect to a given url", async () => {
848+
it("can connect to a given url", async () => {
853849
// http connection
854850
{
855851
const client = await Tendermint34Client.connect("http://" + url);
@@ -867,14 +863,13 @@ describe("Tendermint34Client", () => {
867863
}
868864
});
869865

870-
(tendermintEnabled ? describe : xdescribe)("With HttpClient", () => {
866+
describe("With HttpClient", () => {
871867
defaultTestSuite(() => new HttpClient("http://" + url), expected);
872868
});
873869

874-
(tendermintEnabled ? describe : xdescribe)("With WebsocketClient", () => {
870+
describe("With WebsocketClient", () => {
875871
// don't print out WebSocket errors if marked pending
876-
const onError = globalThis.process?.env.TENDERMINT_ENABLED ? console.error : () => 0;
877-
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, onError);
872+
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, console.error);
878873
defaultTestSuite(factory, expected);
879874
websocketTestSuite(factory, expected);
880875
});

‎packages/tendermint-rpc/src/tendermint37/tendermint37client.spec.ts‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -253,27 +253,25 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
253253

254254
describe("blockSearch", () => {
255255
beforeAll(async () => {
256-
if (tendermintEnabled) {
257-
const client = Tendermint37Client.create(rpcFactory());
256+
const client = Tendermint37Client.create(rpcFactory());
258257

259-
async function sendTx(): Promise<void> {
260-
const tx = buildKvTx(randomString(), randomString());
258+
async function sendTx(): Promise<void> {
259+
const tx = buildKvTx(randomString(), randomString());
261260

262-
const txRes = await client.broadcastTxCommit({ tx: tx });
263-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
264-
expect(txRes.height).toBeTruthy();
265-
expect(txRes.hash.length).not.toEqual(0);
266-
}
261+
const txRes = await client.broadcastTxCommit({ tx: tx });
262+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
263+
expect(txRes.height).toBeTruthy();
264+
expect(txRes.hash.length).not.toEqual(0);
265+
}
267266

268-
// send 3 txs
269-
await sendTx();
270-
await sendTx();
271-
await sendTx();
267+
// send 3 txs
268+
await sendTx();
269+
await sendTx();
270+
await sendTx();
272271

273-
client.disconnect();
272+
client.disconnect();
274273

275-
await tendermintSearchIndexUpdated();
276-
}
274+
await tendermintSearchIndexUpdated();
277275
});
278276

279277
it("can paginate over blockSearch results", async () => {
@@ -436,29 +434,27 @@ function defaultTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValues)
436434
let broadcast1: responses.BroadcastTxCommitResponse | undefined;
437435

438436
beforeAll(async () => {
439-
if (tendermintEnabled) {
440-
const client = Tendermint37Client.create(rpcFactory());
441-
442-
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
443-
const me = randomString();
444-
const tx = buildKvTx(txKey, me);
445-
446-
const txRes = await client.broadcastTxCommit({ tx: tx });
447-
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
448-
expect(txRes.height).toBeTruthy();
449-
expect(txRes.hash.length).toEqual(32);
450-
return [tx, txRes];
451-
}
452-
453-
// send 3 txs
454-
[tx1, broadcast1] = await sendTx();
455-
await sendTx();
456-
await sendTx();
437+
const client = Tendermint37Client.create(rpcFactory());
457438

458-
client.disconnect();
439+
async function sendTx(): Promise<[Uint8Array, responses.BroadcastTxCommitResponse]> {
440+
const me = randomString();
441+
const tx = buildKvTx(txKey, me);
459442

460-
await tendermintSearchIndexUpdated();
443+
const txRes = await client.broadcastTxCommit({ tx: tx });
444+
expect(responses.broadcastTxCommitSuccess(txRes)).toEqual(true);
445+
expect(txRes.height).toBeTruthy();
446+
expect(txRes.hash.length).toEqual(32);
447+
return [tx, txRes];
461448
}
449+
450+
// send 3 txs
451+
[tx1, broadcast1] = await sendTx();
452+
await sendTx();
453+
await sendTx();
454+
455+
client.disconnect();
456+
457+
await tendermintSearchIndexUpdated();
462458
});
463459

464460
it("finds a single tx by hash", async () => {
@@ -848,10 +844,10 @@ function websocketTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValue
848844
});
849845
}
850846

851-
describe("Tendermint37Client", () => {
847+
(tendermintEnabled ? describe : xdescribe)("Tendermint37Client", () => {
852848
const { url, expected } = tendermintInstances[37];
853849

854-
(tendermintEnabled ? it : xit)("can connect to a given url", async () => {
850+
it("can connect to a given url", async () => {
855851
// http connection
856852
{
857853
const client = await Tendermint37Client.connect("http://" + url);
@@ -869,14 +865,13 @@ describe("Tendermint37Client", () => {
869865
}
870866
});
871867

872-
(tendermintEnabled ? describe : xdescribe)("With HttpClient", () => {
868+
describe("With HttpClient", () => {
873869
defaultTestSuite(() => new HttpClient("http://" + url), expected);
874870
});
875871

876-
(tendermintEnabled ? describe : xdescribe)("With WebsocketClient", () => {
872+
describe("With WebsocketClient", () => {
877873
// don't print out WebSocket errors if marked pending
878-
const onError = globalThis.process?.env.TENDERMINT_ENABLED ? console.error : () => 0;
879-
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, onError);
874+
const factory = (): WebsocketClient => new WebsocketClient("ws://" + url, console.error);
880875
defaultTestSuite(factory, expected);
881876
websocketTestSuite(factory, expected);
882877
});

0 commit comments

Comments
 (0)