Skip to content

Commit 4e466c2

Browse files
committed
Cleanup
1 parent d8844a3 commit 4e466c2

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

packages/node-integration-tests/utils/index.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,6 @@ export class TestEnv {
132132
this.server = server;
133133
this.url = url;
134134
this._terminator = createHttpTerminator({ server: this.server, gracefulTerminationTimeout: 0 });
135-
136-
// We need to destroy the socket after the response has been sent
137-
// to prevent the server.close (called inside nock interceptor) from hanging in tests.
138-
// Otherwise the tests may timeout. (Happening on Node 20)
139-
// See: https://github.com/nodejs/node/issues/2642
140-
this.server.on('request', (req, res) => {
141-
res.on('finish', () => {
142-
req.socket.end();
143-
});
144-
});
145135
}
146136

147137
/**

packages/remix/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@
6868
"lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
6969
"test": "yarn test:unit",
7070
"test:integration": "run-s test:integration:v1 test:integration:v2",
71-
"test:integration:v1": "run-s test:integration:prepare test:integration:client test:integration:server",
71+
"test:integration:v1": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
7272
"test:integration:v2": "export REMIX_VERSION=2 && run-s test:integration:v1",
7373
"test:integration:ci": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
7474
"test:integration:prepare": "(cd test/integration && yarn)",
7575
"test:integration:clean": "(cd test/integration && rimraf .cache node_modules build)",
7676
"test:integration:client": "yarn playwright install-deps && yarn playwright test test/integration/test/client/",
7777
"test:integration:client:ci": "yarn test:integration:client --browser='all' --reporter='line'",
78-
"test:integration:server": "export NODE_OPTIONS='--stack-trace-limit=25' && jest --runInBand --config=test/integration/jest.config.js test/integration/test/server/",
78+
"test:integration:server": "export NODE_OPTIONS='--stack-trace-limit=25' && jest --config=test/integration/jest.config.js test/integration/test/server/",
7979
"test:unit": "jest",
8080
"test:watch": "jest --watch",
8181
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push"

packages/remix/test/integration/jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ module.exports = {
66
testPathIgnorePatterns: [`${__dirname}/test/client`],
77
detectOpenHandles: true,
88
forceExit: true,
9-
testTimeout: 10000,
109
};

0 commit comments

Comments
 (0)