Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Fixed dependency between tests in batch sending integration tests (#20932)

Browse source 
no issue

- One of the tests in this suite added a member and didn't clean it up
when it was finished.
- Because of this, the tests after this one depended on this test
running first, so running an individual test in isolation might fail,
despite passing when run in the whole test suite
- This commit removes the added member, so all the tests in this suite
should pass whether run independently or all together
This commit is contained in:
Chris Raible 2024-09-05 13:37:06 -07:00 • committed by GitHub
parent 3f797d5882
commit 289b18c01f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ghost/core/test/integration/services/email-service/batch-sending.test.js
View file

@ -240,6 +240,9 @@ describe('Batch sending tests', function () {
assert.equal(emailModel2.get('email_count'), 5); assert.equal(emailModel2.get('email_count'), 5);
const emailRecipients2 = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel2.id}'`}); const emailRecipients2 = await models.EmailRecipient.findAll({filter: `email_id:'${emailModel2.id}'`});
assert.equal(emailRecipients2.models.length, emailRecipients.models.length + 1); assert.equal(emailRecipients2.models.length, emailRecipients.models.length + 1);
// Clean up laterMember
await models.Member.destroy({id: laterMember.id});
}); });
it('Splits recipients in free and paid batch', async function () { it('Splits recipients in free and paid batch', async function () {
@ -249,7 +252,7 @@ describe('Batch sending tests', function () {
// Required to trigger the paywall // Required to trigger the paywall
visibility: 'paid' visibility: 'paid'
}, null, [ }, null, [
{segment: 'status:free', recipients: 3}, {segment: 'status:free', recipients: 2},
{segment: 'status:-free', recipients: 2} {segment: 'status:-free', recipients: 2}
]); ]);
}); });
@ -258,7 +261,7 @@ describe('Batch sending tests', function () {
await testEmailBatches({ await testEmailBatches({
mobiledoc: mobileDocWithFreeMemberOnly // = different content for paid and free members (extra content for free in this case) mobiledoc: mobileDocWithFreeMemberOnly // = different content for paid and free members (extra content for free in this case)
}, null, [ }, null, [
{segment: 'status:free', recipients: 3}, {segment: 'status:free', recipients: 2},
{segment: 'status:-free', recipients: 2} {segment: 'status:-free', recipients: 2}
]); ]);
}); });
@ -267,7 +270,7 @@ describe('Batch sending tests', function () {
await testEmailBatches({ await testEmailBatches({
mobiledoc: mobileDocWithPaidMemberOnly // = different content for paid and free members (extra content for paid in this case) mobiledoc: mobileDocWithPaidMemberOnly // = different content for paid and free members (extra content for paid in this case)
}, null, [ }, null, [
{segment: 'status:free', recipients: 3}, {segment: 'status:free', recipients: 2},
{segment: 'status:-free', recipients: 2} {segment: 'status:-free', recipients: 2}
]); ]);
}); });
@ -276,7 +279,7 @@ describe('Batch sending tests', function () {
await testEmailBatches({ await testEmailBatches({
mobiledoc: mobileDocWithPaidAndFreeMemberOnly // = different content for paid and free members mobiledoc: mobileDocWithPaidAndFreeMemberOnly // = different content for paid and free members
}, null, [ }, null, [
{segment: 'status:free', recipients: 3}, {segment: 'status:free', recipients: 2},
{segment: 'status:-free', recipients: 2} {segment: 'status:-free', recipients: 2}
]); ]);
}); });
@ -287,7 +290,7 @@ describe('Batch sending tests', function () {
// Required to trigger the paywall // Required to trigger the paywall
visibility: 'paid' visibility: 'paid'
}, null, [ }, null, [
{segment: 'status:free', recipients: 3}, {segment: 'status:free', recipients: 2},
{segment: 'status:-free', recipients: 2} {segment: 'status:-free', recipients: 2}
]); ]);
}); });
@ -296,7 +299,7 @@ describe('Batch sending tests', function () {
await testEmailBatches({ await testEmailBatches({
mobiledoc: mobileDocExample // = same content for free and paid, no need to split batches mobiledoc: mobileDocExample // = same content for free and paid, no need to split batches
}, null, [ }, null, [
{segment: null, recipients: 5} {segment: null, recipients: 4}
]); ]);
}); });
@ -368,7 +371,6 @@ describe('Batch sending tests', function () {
{segment: null, recipients: 1}, {segment: null, recipients: 1},
{segment: null, recipients: 1}, {segment: null, recipients: 1},
{segment: null, recipients: 1}, {segment: null, recipients: 1},
{segment: null, recipients: 1},
{segment: null, recipients: 1} {segment: null, recipients: 1}
]); ]);
}); });
@ -384,7 +386,6 @@ describe('Batch sending tests', function () {
// 3 free // 3 free
{segment: 'status:free', recipients: 1}, {segment: 'status:free', recipients: 1},
{segment: 'status:free', recipients: 1},
{segment: 'status:free', recipients: 1} {segment: 'status:free', recipients: 1}
]); ]);
}); });
@ -408,11 +409,11 @@ describe('Batch sending tests', function () {
// Prepare a post and email model // Prepare a post and email model
const {emailModel} = await sendFailedEmail(agent); const {emailModel} = await sendFailedEmail(agent);
assert.equal(emailModel.get('email_count'), 5); assert.equal(emailModel.get('email_count'), 4);
// Did we create batches? // Did we create batches?
let batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`}); let batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
assert.equal(batches.models.length, 5); assert.equal(batches.models.length, 4);
// sort batches by id because findAll doesn't have order option // sort batches by id because findAll doesn't have order option
batches.models.sort(sortBatches); batches.models.sort(sortBatches);
@ -424,7 +425,7 @@ describe('Batch sending tests', function () {
for (const batch of batches.models) { for (const batch of batches.models) {
count += 1; count += 1;
if (count === 5) { if (count === 4) {
assert.equal(batch.get('provider_id'), null); assert.equal(batch.get('provider_id'), null);
assert.equal(batch.get('status'), 'failed'); assert.equal(batch.get('status'), 'failed');
assert.equal(batch.get('error_status_code'), 500); assert.equal(batch.get('error_status_code'), 500);
@ -433,13 +434,7 @@ describe('Batch sending tests', function () {
assert.equal(errorData.error.status, 500); assert.equal(errorData.error.status, 500);
assert.deepEqual(errorData.messageData.to.length, 1); assert.deepEqual(errorData.messageData.to.length, 1);
} else { } else {
if (count === 4) { assert.equal(batch.get('provider_id'), 'stubbed-email-id-' + count);
// We sorted on provider_id so the count is slightly off
assert.equal(batch.get('provider_id'), 'stubbed-email-id-5');
} else {
assert.equal(batch.get('provider_id'), 'stubbed-email-id-' + count);
}
assert.equal(batch.get('status'), 'submitted'); assert.equal(batch.get('status'), 'submitted');
assert.equal(batch.get('error_status_code'), null); assert.equal(batch.get('error_status_code'), null);
assert.equal(batch.get('error_message'), null); assert.equal(batch.get('error_message'), null);
@ -469,14 +464,14 @@ describe('Batch sending tests', function () {
batches.models.sort(sortBatches); batches.models.sort(sortBatches);
assert.equal(emailModel.get('status'), 'submitted'); assert.equal(emailModel.get('status'), 'submitted');
assert.equal(emailModel.get('email_count'), 5); assert.equal(emailModel.get('email_count'), 4);
// Did we keep the batches? // Did we keep the batches?
batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`}); batches = await models.EmailBatch.findAll({filter: `email_id:'${emailModel.id}'`});
// sort batches by provider_id (nullable) because findAll doesn't have order option // sort batches by provider_id (nullable) because findAll doesn't have order option
batches.models.sort(sortBatches); batches.models.sort(sortBatches);
assert.equal(batches.models.length, 5); assert.equal(batches.models.length, 4);
emailRecipients = []; emailRecipients = [];