Skip to content

Chrome DevTools for coding agents

test: remove manual Sinon restores (#3298)

Nikolay Vitkov0174df59a881
diff --git a/scripts/eval_gemini.ts b/scripts/eval_gemini.ts
index 3ad738b6..68cce58f 100644
--- a/scripts/eval_gemini.ts
+++ b/scripts/eval_gemini.ts
@@ -264,7 +264,7 @@ async function main() {
console.error(e);
failureCount++;
} finally {
- server.restore();
+ server.reset();
}
}
}
diff --git a/tests/ToolHandler.test.ts b/tests/ToolHandler.test.ts
index feab73db..0f32d0f6 100644
--- a/tests/ToolHandler.test.ts
+++ b/tests/ToolHandler.test.ts
@@ -779,7 +779,7 @@ describe('ToolHandler', () => {
}
const logSpy = sinon.spy();
- sinon.stub(ClearcutLogger, 'get').returns({
+ const getLoggerStub = sinon.stub(ClearcutLogger, 'get').returns({
logToolInvocation: logSpy,
} as unknown as ClearcutLogger);
@@ -800,7 +800,7 @@ describe('ToolHandler', () => {
assert.strictEqual(logSpy.firstCall.args[0].pageUrl, testCase.pageUrl);
assert.strictEqual(handlerCalled, true);
- sinon.restore();
+ getLoggerStub.restore();
ClearcutLogger.resetForTesting();
}
});
diff --git a/tests/devtools/DevToolsCommentBridge.test.ts b/tests/devtools/DevToolsCommentBridge.test.ts
index 0dcd4d44..1b2961d5 100644
--- a/tests/devtools/DevToolsCommentBridge.test.ts
+++ b/tests/devtools/DevToolsCommentBridge.test.ts
@@ -5,7 +5,7 @@
*/
import assert from 'node:assert';
-import {afterEach, beforeEach, describe, it} from 'node:test';
+import {beforeEach, describe, it} from 'node:test';
import sinon from 'sinon';
@@ -19,10 +19,6 @@ describe('DevToolsCommentBridge', () => {
clock = sinon.useFakeTimers();
});
- afterEach(() => {
- clock.restore();
- });
-
it('attaches to DevTools page and registers function and evaluation', async () => {
const devtoolsPage = createMockPuppeteerPage();
devtoolsPage.evaluate.resolves(true);
diff --git a/tests/server.ts b/tests/server.ts
index 9e340214..c164419a 100644
--- a/tests/server.ts
+++ b/tests/server.ts
@@ -83,7 +83,7 @@ export class TestServer {
}
}
- restore(): void {
+ reset(): void {
this.#routes = {};
}
@@ -138,7 +138,7 @@ export function serverHooks(): TestServer {
await server.stop();
});
afterEach(() => {
- server.restore();
+ server.reset();
});
return server;
diff --git a/tests/telemetry/watchdog/ClearcutSender.test.ts b/tests/telemetry/watchdog/ClearcutSender.test.ts
index 984d3f9c..62a7362e 100644
--- a/tests/telemetry/watchdog/ClearcutSender.test.ts
+++ b/tests/telemetry/watchdog/ClearcutSender.test.ts
@@ -6,7 +6,7 @@
import assert from 'node:assert';
import crypto from 'node:crypto';
-import {describe, it, afterEach, beforeEach} from 'node:test';
+import {describe, it, beforeEach} from 'node:test';
import sinon from 'sinon';
@@ -17,7 +17,6 @@ import {ClearcutSender} from '../../../src/telemetry/watchdog/ClearcutSender.js'
const FLUSH_INTERVAL_MS = 15 * 1000;
describe('ClearcutSender', () => {
- let randomUUIDStub: sinon.SinonStub;
let fetchStub: sinon.SinonStub;
let clock: sinon.SinonFakeTimers;
@@ -28,19 +27,13 @@ describe('ClearcutSender', () => {
});
let uuidCounter = 0;
- randomUUIDStub = sinon.stub(crypto, 'randomUUID').callsFake(() => {
+ sinon.stub(crypto, 'randomUUID').callsFake(() => {
return `uuid-${++uuidCounter}` as ReturnType<typeof crypto.randomUUID>;
});
fetchStub = sinon.stub(global, 'fetch');
fetchStub.resolves(new Response(JSON.stringify({}), {status: 200}));
});
- afterEach(() => {
- randomUUIDStub.restore();
- fetchStub.restore();
- clock.restore();
- });
-
it('enriches events with app version, os type, and session id', async () => {
const sender = new ClearcutSender({
appVersion: '1.0.0',
diff --git a/tests/tools/input.test.ts b/tests/tools/input.test.ts
index 74c21d27..4ec45c2a 100644
--- a/tests/tools/input.test.ts
+++ b/tests/tools/input.test.ts
@@ -1780,7 +1780,7 @@ describe('input', () => {
// Simulate the main key press failing mid-sequence (e.g. a CDP
// hiccup) after the modifiers have already been pressed down.
- sinon
+ const pressStub = sinon
.stub(page.keyboard, 'press')
.throws(new Error('injected press failure'));
@@ -1798,7 +1798,7 @@ describe('input', () => {
),
);
} finally {
- sinon.restore();
+ pressStub.restore();
}
// The modifiers were pressed down; both must be released even though