Skip to content

[pull] main from TryGhost:main #887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jan 30, 2026
+26 −27
Merged

[pull] main from TryGhost:main #887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions ghost/core/test/unit/server/services/email-service/mailgun-email-provider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const MailgunEmailProvider = require('../../../../../core/server/services/email-service/mailgun-email-provider');
const sinon = require('sinon');
const should = require('should');
const assert = require('assert/strict');

describe('Mailgun Email Provider', function () {
Expand Down Expand Up @@ -62,9 +61,9 @@ describe('Mailgun Email Provider', function () {
openTrackingEnabled: true,
deliveryTime
});
should(response.id).eql('provider-123');
should(sendStub.calledOnce).be.true();
sendStub.calledWith(
assert.equal(response.id, 'provider-123');
sinon.assert.calledOnce(sendStub);
sinon.assert.calledWith(sendStub,
{
subject: 'Hi',
html: '<html><body>Hi %recipient.name%</body></html>',
Expand All @@ -79,7 +78,7 @@ describe('Mailgun Email Provider', function () {
},
{'member@example.com': {name: 'John'}},
[]
).should.be.true();
);
});

it('handles mailgun client error correctly', async function () {
Expand All @@ -99,8 +98,8 @@ describe('Mailgun Email Provider', function () {
mailgunClient,
errorHandler: () => {}
});
try {
const response = await mailgunEmailProvider.send({
await assert.rejects(async () => {
await mailgunEmailProvider.send({
subject: 'Hi',
html: '<html><body>Hi {{name}}</body></html>',
plaintext: 'Hi',
Expand All @@ -127,12 +126,12 @@ describe('Mailgun Email Provider', function () {
}
]
}, {});
should(response).be.undefined();
} catch (e) {
should(e.message).eql('Bad Request: Invalid domain');
should(e.statusCode).eql(400);
should(e.errorDetails).eql('{"error":{"details":"Invalid domain","status":400},"messageData":{}}');
}
assert.fail();
}, {
message: 'Bad Request: Invalid domain',
statusCode: 400,
errorDetails: '{"error":{"details":"Invalid domain","status":400},"messageData":{}}'
});
});

it('handles unknown error correctly', async function () {
Expand All @@ -147,8 +146,8 @@ describe('Mailgun Email Provider', function () {
mailgunClient,
errorHandler: () => {}
});
try {
const response = await mailgunEmailProvider.send({
await assert.rejects(async () => {
await mailgunEmailProvider.send({
subject: 'Hi',
html: '<html><body>Hi {{name}}</body></html>',
plaintext: 'Hi',
Expand All @@ -175,11 +174,11 @@ describe('Mailgun Email Provider', function () {
}
]
}, {});
should(response).be.undefined();
} catch (e) {
should(e.message).eql('Unknown Error');
should(e.errorDetails).eql(undefined);
}
assert.fail();
}, {
message: 'Unknown Error',
errorDetails: undefined
});
});

it('handles empty error correctly', async function () {
Expand All @@ -194,8 +193,8 @@ describe('Mailgun Email Provider', function () {
mailgunClient,
errorHandler: () => {}
});
try {
const response = await mailgunEmailProvider.send({
await assert.rejects(async () => {
await mailgunEmailProvider.send({
subject: 'Hi',
html: '<html><body>Hi {{name}}</body></html>',
plaintext: 'Hi',
Expand All @@ -222,11 +221,11 @@ describe('Mailgun Email Provider', function () {
}
]
}, {});
should(response).be.undefined();
} catch (e) {
should(e.message).eql('Mailgun Error');
should(e.errorDetails).eql(undefined);
}
assert.fail();
}, {
message: 'Mailgun Error',
errorDetails: undefined
});
});
});

Expand Down