Skip to content

Commit 2fcdf69

Browse files
committed
test(reactive-rpc): đź’Ť move Reactive RPC E2E tests under the /src/reactive-rpc folder
1 parent acd6379 commit 2fcdf69

File tree

6 files changed

+32
-34
lines changed

6 files changed

+32
-34
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"test:cli:pointer": "./bin/json-pointer-test.js ./bin/json-pointer.js",
5454
"test:cli:patch": "./bin/json-patch-test.js ./bin/json-patch.js",
5555
"test:cli:pack": "./bin/json-pack-test.js ./bin/json-pack.js",
56-
"test:reactive-rpc": "node -r ts-node/register/transpile-only src/__tests__/reactive-rpc/run.ts",
57-
"test:reactive-rpc:jest": "TEST_E2E=1 jest --maxWorkers 1 --no-cache src/__tests__/reactive-rpc/",
56+
"test:reactive-rpc": "node -r ts-node/register/transpile-only src/reactive-rpc/__tests__/e2e/run.ts",
57+
"test:reactive-rpc:jest": "TEST_E2E=1 jest --maxWorkers 1 --no-cache src/reactive-rpc/__tests__/e2e/",
5858
"demo:json-patch": "ts-node src/json-patch/__demos__/json-patch.ts",
5959
"demo:json-pointer": "ts-node src/json-pointer/__demos__/json-pointer.ts",
6060
"demo:reactive-rpc:server": "ts-node src/reactive-rpc/__demos__/server.ts",

‎src/__tests__/reactive-rpc/README.md‎ renamed to ‎src/reactive-rpc/__tests__/e2e/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ yarn test:reactive-rpc:jest
2222
To run a specific test suite use this command:
2323

2424
```
25-
TEST_E2E=1 npx jest --no-cache src/__tests__/reactive-rpc/uws/http/rx-rpc/FetchRpcClient.spec.ts
25+
TEST_E2E=1 npx jest --no-cache src/reactive-rpc/__tests__/e2e/uws/ws/RpcPersistentClient.spec.ts
2626
```

‎src/__tests__/reactive-rpc/run.ts‎ renamed to ‎src/reactive-rpc/__tests__/e2e/run.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {spawn} from 'child_process';
2-
import {Defer} from '../../util/Defer';
2+
import {Defer} from '../../../util/Defer';
33

44
const startServer = async () => {
55
const started = new Defer<void>();
@@ -59,11 +59,9 @@ const runTests = async () => {
5959
const server = await startServer();
6060
await server.started;
6161
let exitCode = 0;
62-
for (let i = 0; i < 3; i++) {
63-
const jest = await runTests();
64-
exitCode = await jest.exitCode;
65-
if (exitCode !== 0) throw exitCode;
66-
}
62+
const jest = await runTests();
63+
exitCode = await jest.exitCode;
64+
if (exitCode !== 0) throw exitCode;
6765
process.exit(exitCode);
6866
} catch (error) {
6967
// tslint:disable-next-line no-console

‎src/__tests__/reactive-rpc/uws/http/FetchRpcClient.spec.ts‎ renamed to ‎src/reactive-rpc/__tests__/e2e/uws/http/FetchRpcClient.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* @jest-environment node
33
*/
44

5-
import {ApiTestSetup, runApiTests} from '../../../../reactive-rpc/common/rpc/__tests__/runApiTests';
6-
import {RpcCodecs} from '../../../../reactive-rpc/common/codec/RpcCodecs';
7-
import {RpcMessageCodecs} from '../../../../reactive-rpc/common/codec/RpcMessageCodecs';
8-
import {Writer} from '../../../../util/buffers/Writer';
9-
import {Codecs} from '../../../../json-pack/codecs/Codecs';
10-
import {RpcMessageCodec} from '../../../../reactive-rpc/common/codec/types';
11-
import {JsonValueCodec} from '../../../../json-pack/codecs/types';
12-
import {FetchRpcClient} from '../../../../reactive-rpc/common/rpc/client/FetchRpcClient';
5+
import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApiTests';
6+
import {RpcCodecs} from '../../../../common/codec/RpcCodecs';
7+
import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs';
8+
import {Writer} from '../../../../../util/buffers/Writer';
9+
import {Codecs} from '../../../../../json-pack/codecs/Codecs';
10+
import {RpcMessageCodec} from '../../../../common/codec/types';
11+
import {JsonValueCodec} from '../../../../../json-pack/codecs/types';
12+
import {FetchRpcClient} from '../../../../common/rpc/client/FetchRpcClient';
1313

1414
if (process.env.TEST_E2E) {
1515
const codecs = new RpcCodecs(new Codecs(new Writer()), new RpcMessageCodecs());
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* @jest-environment node
33
*/
44

5-
import {ApiTestSetup, runApiTests} from '../../../../reactive-rpc/common/rpc/__tests__/runApiTests';
6-
import {StreamingRpcClient} from '../../../../reactive-rpc/common';
7-
import {RpcCodecs} from '../../../../reactive-rpc/common/codec/RpcCodecs';
8-
import {RpcMessageCodecs} from '../../../../reactive-rpc/common/codec/RpcMessageCodecs';
9-
import {Writer} from '../../../../util/buffers/Writer';
10-
import {Codecs} from '../../../../json-pack/codecs/Codecs';
11-
import {RpcMessageCodec} from '../../../../reactive-rpc/common/codec/types';
12-
import {JsonValueCodec} from '../../../../json-pack/codecs/types';
5+
import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApiTests';
6+
import {StreamingRpcClient} from '../../../../common';
7+
import {RpcCodecs} from '../../../../common/codec/RpcCodecs';
8+
import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs';
9+
import {Writer} from '../../../../../util/buffers/Writer';
10+
import {Codecs} from '../../../../../json-pack/codecs/Codecs';
11+
import {RpcMessageCodec} from '../../../../common/codec/types';
12+
import {JsonValueCodec} from '../../../../../json-pack/codecs/types';
1313

1414
if (process.env.TEST_E2E) {
1515
const codecs = new RpcCodecs(new Codecs(new Writer()), new RpcMessageCodecs());
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
* @jest-environment node
33
*/
44

5-
import {ApiTestSetup, runApiTests} from '../../../../reactive-rpc/common/rpc/__tests__/runApiTests';
5+
import {ApiTestSetup, runApiTests} from '../../../../common/rpc/__tests__/runApiTests';
66
import WebSocket from 'ws';
7-
import {RpcCodecs} from '../../../../reactive-rpc/common/codec/RpcCodecs';
8-
import {RpcMessageCodecs} from '../../../../reactive-rpc/common/codec/RpcMessageCodecs';
9-
import {Writer} from '../../../../util/buffers/Writer';
10-
import {Codecs} from '../../../../json-pack/codecs/Codecs';
11-
import {RpcMessageCodec} from '../../../../reactive-rpc/common/codec/types';
12-
import {JsonValueCodec} from '../../../../json-pack/codecs/types';
13-
import {RpcCodec} from '../../../../reactive-rpc/common/codec/RpcCodec';
14-
import {RpcPersistentClient, WebSocketChannel} from '../../../../reactive-rpc/common';
7+
import {RpcCodecs} from '../../../../common/codec/RpcCodecs';
8+
import {RpcMessageCodecs} from '../../../../common/codec/RpcMessageCodecs';
9+
import {Writer} from '../../../../../util/buffers/Writer';
10+
import {Codecs} from '../../../../../json-pack/codecs/Codecs';
11+
import {RpcMessageCodec} from '../../../../common/codec/types';
12+
import {JsonValueCodec} from '../../../../../json-pack/codecs/types';
13+
import {RpcCodec} from '../../../../common/codec/RpcCodec';
14+
import {RpcPersistentClient, WebSocketChannel} from '../../../../common';
1515

1616
if (process.env.TEST_E2E) {
1717
const codecs = new RpcCodecs(new Codecs(new Writer()), new RpcMessageCodecs());

0 commit comments

Comments
 (0)