Merge pull request #26968 from overleaf/em-revert-jul8

Revert bad deploy

GitOrigin-RevId: fd6227cf4fde7fd8053b47365154d59d15fa115e
This commit is contained in:
Eric Mc Sween
2025-07-09 08:07:12 +00:00
committed by Copybot
parent 9d1641a1ab
commit ebf810e836
22 changed files with 177 additions and 292 deletions
@@ -73,8 +73,6 @@ describe('SubscriptionGroupController', function () {
.resolves(ctx.previewSubscriptionChangeData),
checkBillingInfoExistence: sinon.stub().resolves(ctx.paymentMethod),
updateSubscriptionPaymentTerms: sinon.stub().resolves(),
ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
sinon.stub().resolves(),
},
}
@@ -107,6 +105,12 @@ describe('SubscriptionGroupController', function () {
},
}
ctx.SplitTestHandler = {
promises: {
getAssignment: sinon.stub().resolves({ variant: 'enabled' }),
},
}
ctx.UserGetter = {
promises: {
getUserEmail: sinon.stub().resolves(ctx.user.email),
@@ -136,7 +140,6 @@ describe('SubscriptionGroupController', function () {
InactiveError: class extends Error {},
SubtotalLimitExceededError: class extends Error {},
HasPastDueInvoiceError: class extends Error {},
HasNoAdditionalLicenseWhenManuallyCollectedError: class extends Error {},
}
vi.doMock(
@@ -168,6 +171,13 @@ describe('SubscriptionGroupController', function () {
default: ctx.Modules,
}))
vi.doMock(
'../../../../app/src/Features/SplitTests/SplitTestHandler',
() => ({
default: ctx.SplitTestHandler,
})
)
vi.doMock('../../../../app/src/Features/User/UserGetter', () => ({
default: ctx.UserGetter,
}))
@@ -446,9 +456,6 @@ describe('SubscriptionGroupController', function () {
ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence
.calledWith(ctx.recurlySubscription, ctx.adminUserId)
.should.equal(true)
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
.calledWith(ctx.recurlySubscription)
.should.equal(true)
page.should.equal('subscriptions/add-seats')
props.subscriptionId.should.equal(ctx.subscriptionId)
props.groupName.should.equal(ctx.subscription.teamName)
@@ -514,28 +521,6 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to manually collected subscription error page when collection method is manual and has no additional license add-on', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual =
sinon
.stub()
.throws(
new ctx.Errors.HasNoAdditionalLicenseWhenManuallyCollectedError()
)
const res = {
redirect: url => {
url.should.equal(
'/user/subscription/group/manually-collected-subscription'
)
resolve()
},
}
ctx.Controller.addSeatsToGroupSubscription(ctx.req, res)
})
})
it('should redirect to subscription page when there is a pending change', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =