Skip to content

Commit 4731d6d

Browse files
meem08codebuff-team
andcommitted
ci: repair 1274 branch after main merge (restore package files, fix cancel test)
The main merge re-introduced a duplicate mysql2 override that made package.json invalid JSON, churned package-lock.json, and left a broken concurrent-cancel block in the integration test (duplicate promise2 declaration and dangling .set chain) that failed to compile. Restore package.json and package-lock.json to match main and repair the integration test so the branch diff contains only the keeper-key blast radius change. Generated with Codebuff 🤖 Co-Authored-By: Codebuff <noreply@codebuff.com>
1 parent 24c6fb3 commit 4731d6d

3 files changed

Lines changed: 85 additions & 161 deletions

File tree

backend/tests/integration/streams/cancel.test.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ describe('POST /v1/streams/:streamId/cancel', () => {
169169
isActive: true,
170170
};
171171

172-
// Both requests observe the active stream, so each cancels on-chain and
173-
// marks the stream inactive.
174172
// Both requests observe the active stream, so each performs its own
175173
// on-chain cancel and marks the stream inactive.
176174
(prisma.stream.findUnique as any).mockResolvedValue(mockStream);
@@ -186,10 +184,6 @@ describe('POST /v1/streams/:streamId/cancel', () => {
186184
.post(`/v1/streams/${streamId}/cancel`)
187185
.set('Authorization', 'Bearer dummy_token')
188186
.send({ senderSecret: 'S_SECRET_123' });
189-
.set('Authorization', 'Bearer dummy_token');
190-
const promise2 = request(app)
191-
.post(`/v1/streams/${streamId}/cancel`)
192-
.set('Authorization', 'Bearer dummy_token');
193187

194188
const [res1, res2] = await Promise.all([promise1, promise2]);
195189

@@ -209,7 +203,6 @@ describe('POST /v1/streams/:streamId/cancel', () => {
209203
expect(sorobanService.cancelStream).toHaveBeenCalledTimes(2);
210204
expect(sorobanService.cancelStream).toHaveBeenCalledWith(BigInt(streamId), 'S_SECRET_123');
211205

212-
// Stream should be marked as inactive
213206
// Stream should be marked as inactive via the repository helper
214207
expect(prisma.stream.update).toHaveBeenCalledWith({
215208
where: { streamId: BigInt(streamId) },

0 commit comments

Comments
 (0)