Skip to content

Commit 6f83f7e

Browse files
author
magne
committed
fix: sender error test and remove ts-node
1 parent 45b0d04 commit 6f83f7e

File tree

5 files changed

+16
-207
lines changed

5 files changed

+16
-207
lines changed

package-lock.json

Lines changed: 14 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"globals": "^16.2.0",
5656
"got": "^14.4.7",
5757
"prettier": "3.5.3",
58-
"ts-node": "^10.9.2",
5958
"tsup": "^8.5.0",
6059
"typescript": "^5.8.3",
6160
"typescript-eslint": "^8.33.1",

src/publisher.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ export class AmqpPublisher implements Publisher {
8383
return promise.resolve({ delivery: context.delivery, outcome: getOutcomeStateFrom(senderEvent) })
8484
}
8585
}
86-
return Promise.reject("Message cannot be handled successfully")
8786
}
8887
}
8988
this.errorMessageHandler = (context: EventContext, errorEvent: RejectableSenderEvents, deliveryId: number) => {
@@ -93,7 +92,6 @@ export class AmqpPublisher implements Publisher {
9392
const error = new Error(`SenderLink error ${errorEvent}: ${inspect(context.error)}`)
9493
return promise.reject(error)
9594
}
96-
return Promise.reject("Unhandled error")
9795
}
9896

9997
this.registerEventListeners()

test/e2e/publisher.test.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
createBinding,
1111
cleanRabbit,
1212
deleteExchange,
13-
expectToThrowAsync,
14-
deleteQueue,
1513
} from "../support/util.js"
1614
import { Connection } from "../../src/connection.js"
1715
import { OutcomeState } from "../../src/utils.js"
@@ -74,20 +72,11 @@ describe("Publisher", () => {
7472
expect(publishResult.outcome).to.eql(OutcomeState.RELEASED)
7573
})
7674

77-
test.skip("publish should throw if exchange is deleted", async () => {
75+
test("publish should throw if exchange is deleted", async () => {
7876
const publisher = await connection.createPublisher({ exchange: { name: exchangeName, routingKey: bindingKey } })
7977
await deleteExchange(exchangeName)
8078

81-
await expectToThrowAsync(() => publisher.publish(createAmqpMessage({ body: "Hello World!" })), Error)
82-
// await expect(publisher.publish(createAmqpMessage({ body: "Hello World!" }))).rejects.toThrowError()
83-
})
84-
85-
test.skip("publish should throw if queue is deleted", async () => {
86-
const publisher = await connection.createPublisher({ queue: { name: queueName } })
87-
await deleteQueue(queueName)
88-
89-
await expectToThrowAsync(() => publisher.publish(createAmqpMessage({ body: "Hello World!" })), Error)
90-
// await expect(publisher.publish(createAmqpMessage({ body: "Hello World!" }))).rejects.toThrowError()
79+
await expect(publisher.publish(createAmqpMessage({ body: "Hello World!" }))).rejects.toThrowError(Error)
9180
})
9281

9382
test("publish a message with address to an exchange", async () => {

test/support/util.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -329,24 +329,3 @@ export async function eventually(fn: Function, timeout = 5000) {
329329
}
330330
}
331331
}
332-
333-
export async function expectToThrowAsync(
334-
method: () => Promise<unknown>,
335-
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
336-
expectedError: Function | Error,
337-
errorMessage: string | RegExp | null = null
338-
): Promise<void> {
339-
let error = null
340-
try {
341-
await method()
342-
} catch (err) {
343-
error = err
344-
}
345-
expect(error).instanceOf(expectedError)
346-
if (errorMessage instanceof RegExp) {
347-
expect((error as { message: string }).message).match(errorMessage)
348-
}
349-
if (typeof errorMessage === "string") {
350-
expect((error as { message: string }).message).eql(errorMessage)
351-
}
352-
}

0 commit comments

Comments
 (0)