Convert return new Promise to await new Promise

GitOrigin-RevId: 49404748cc90cb7bdef0460f7e9837196f81cae8
This commit is contained in:
Andrew Rumble
2025-06-25 08:06:59 +00:00
committed by Copybot
parent c7ae851d39
commit e76a8ff267
31 changed files with 691 additions and 687 deletions
@@ -231,8 +231,8 @@ describe('SubscriptionGroupController', function () {
})
describe('removeUserFromGroup', function () {
it('should use the subscription id for the logged in user and take the user id from the params', function (ctx) {
return new Promise(resolve => {
it('should use the subscription id for the logged in user and take the user id from the params', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
@@ -252,8 +252,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should log that the user has been removed', function (ctx) {
return new Promise(resolve => {
it('should log that the user has been removed', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
@@ -275,8 +275,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO enabled', function (ctx) {
return new Promise(resolve => {
it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
@@ -304,8 +304,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO disabled', function (ctx) {
return new Promise(resolve => {
it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.params = { user_id: userIdToRemove }
ctx.req.entity = ctx.subscription
@@ -328,8 +328,8 @@ describe('SubscriptionGroupController', function () {
})
describe('removeSelfFromGroup', function () {
it('gets subscription and remove user', function (ctx) {
return new Promise(resolve => {
it('gets subscription and remove user', async function (ctx) {
await new Promise(resolve => {
ctx.req.query = { subscriptionId: ctx.subscriptionId }
const memberUserIdToremove = 123456789
ctx.req.session.user._id = memberUserIdToremove
@@ -356,8 +356,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should log that the user has left the subscription', function (ctx) {
return new Promise(resolve => {
it('should log that the user has left the subscription', async function (ctx) {
await new Promise(resolve => {
ctx.req.query = { subscriptionId: ctx.subscriptionId }
const memberUserIdToremove = '123456789'
ctx.req.session.user._id = memberUserIdToremove
@@ -379,8 +379,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO enabled', function (ctx) {
return new Promise(resolve => {
it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
await new Promise(resolve => {
ctx.req.query = { subscriptionId: ctx.subscriptionId }
const memberUserIdToremove = '123456789'
ctx.req.session.user._id = memberUserIdToremove
@@ -409,8 +409,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should call the group SSO hooks with group SSO disabled', function (ctx) {
return new Promise(resolve => {
it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
await new Promise(resolve => {
const userIdToRemove = '31231'
ctx.req.session.user._id = userIdToRemove
ctx.req.params = { user_id: userIdToRemove }
@@ -434,8 +434,8 @@ describe('SubscriptionGroupController', function () {
})
describe('addSeatsToGroupSubscription', function () {
it('should render the "add seats" page', function (ctx) {
return new Promise((resolve, reject) => {
it('should render the "add seats" page', async function (ctx) {
await new Promise((resolve, reject) => {
const res = {
render: (page, props) => {
ctx.SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails
@@ -470,8 +470,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subscription page when getting subscription details fails', function (ctx) {
return new Promise(resolve => {
it('should redirect to subscription page when getting subscription details fails', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails =
sinon.stub().rejects()
@@ -486,8 +486,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subscription page when flexible licensing is not enabled', function (ctx) {
return new Promise(resolve => {
it('should redirect to subscription page when flexible licensing is not enabled', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.ensureFlexibleLicensingEnabled =
sinon.stub().rejects()
@@ -502,8 +502,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to missing billing information page when billing information is missing', function (ctx) {
return new Promise(resolve => {
it('should redirect to missing billing information page when billing information is missing', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence = sinon
.stub()
.throws(new ctx.Errors.MissingBillingInfoError())
@@ -521,8 +521,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subscription page when there is a pending change', function (ctx) {
return new Promise(resolve => {
it('should redirect to subscription page when there is a pending change', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =
sinon.stub().throws(new ctx.Errors.PendingChangeError())
@@ -537,8 +537,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subscription page when subscription is not active', function (ctx) {
return new Promise(resolve => {
it('should redirect to subscription page when subscription is not active', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionIsActive = sinon
.stub()
.rejects()
@@ -554,10 +554,11 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subscription page when subscription has pending invoice', function (ctx) {
it('should redirect to subscription page when subscription has pending invoice', async function (ctx) {
ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPastDueInvoice =
sinon.stub().rejects()
return new Promise(resolve => {
await new Promise(resolve => {
const res = {
redirect: url => {
url.should.equal('/user/subscription')
@@ -571,8 +572,8 @@ describe('SubscriptionGroupController', function () {
})
describe('previewAddSeatsSubscriptionChange', function () {
it('should preview "add seats" change', function (ctx) {
return new Promise(resolve => {
it('should preview "add seats" change', async function (ctx) {
await new Promise(resolve => {
ctx.req.body = { adding: 2 }
const res = {
@@ -589,8 +590,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should fail previewing "add seats" change', function (ctx) {
return new Promise(resolve => {
it('should fail previewing "add seats" change', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.previewAddSeatsSubscriptionChange =
sinon.stub().rejects()
@@ -610,8 +611,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should fail previewing "add seats" change with SubtotalLimitExceededError', function (ctx) {
return new Promise(resolve => {
it('should fail previewing "add seats" change with SubtotalLimitExceededError', async function (ctx) {
await new Promise(resolve => {
ctx.req.body = { adding: 2 }
ctx.SubscriptionGroupHandler.promises.previewAddSeatsSubscriptionChange =
sinon.stub().throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -638,8 +639,8 @@ describe('SubscriptionGroupController', function () {
})
describe('createAddSeatsSubscriptionChange', function () {
it('should apply "add seats" change', function (ctx) {
return new Promise(resolve => {
it('should apply "add seats" change', async function (ctx) {
await new Promise(resolve => {
ctx.req.body = { adding: 2 }
const res = {
@@ -656,8 +657,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should fail applying "add seats" change', function (ctx) {
return new Promise(resolve => {
it('should fail applying "add seats" change', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange =
sinon.stub().rejects()
@@ -677,8 +678,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should fail applying "add seats" change with SubtotalLimitExceededError', function (ctx) {
return new Promise(resolve => {
it('should fail applying "add seats" change with SubtotalLimitExceededError', async function (ctx) {
await new Promise(resolve => {
ctx.req.body = { adding: 2 }
ctx.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange =
sinon.stub().throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -705,8 +706,8 @@ describe('SubscriptionGroupController', function () {
})
describe('submitForm', function () {
it('should build and pass the request body to the sales submit handler', function (ctx) {
return new Promise(resolve => {
it('should build and pass the request body to the sales submit handler', async function (ctx) {
await new Promise(resolve => {
const adding = 100
const poNumber = 'PO123456'
ctx.req.body = { adding, poNumber }
@@ -747,8 +748,8 @@ describe('SubscriptionGroupController', function () {
})
describe('subscriptionUpgradePage', function () {
it('should render "subscription upgrade" page', function (ctx) {
return new Promise(resolve => {
it('should render "subscription upgrade" page', async function (ctx) {
await new Promise(resolve => {
const olSubscription = { membersLimit: 1, teamName: 'test team' }
ctx.SubscriptionModel.Subscription.findOne = () => {
return {
@@ -773,8 +774,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect if failed to generate preview', function (ctx) {
return new Promise(resolve => {
it('should redirect if failed to generate preview', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
.stub()
.rejects()
@@ -790,8 +791,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to missing billing information page when billing information is missing', function (ctx) {
return new Promise(resolve => {
it('should redirect to missing billing information page when billing information is missing', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
.stub()
.throws(new ctx.Errors.MissingBillingInfoError())
@@ -809,8 +810,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to manually collected subscription error page when collection method is manual', function (ctx) {
return new Promise(resolve => {
it('should redirect to manually collected subscription error page when collection method is manual', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
.stub()
.throws(new ctx.Errors.ManuallyCollectedError())
@@ -828,8 +829,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should redirect to subtotal limit exceeded page', function (ctx) {
return new Promise(resolve => {
it('should redirect to subtotal limit exceeded page', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
.stub()
.throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -847,8 +848,8 @@ describe('SubscriptionGroupController', function () {
})
describe('upgradeSubscription', function () {
it('should send 200 response', function (ctx) {
return new Promise(resolve => {
it('should send 200 response', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.upgradeGroupPlan = sinon
.stub()
.resolves()
@@ -864,8 +865,8 @@ describe('SubscriptionGroupController', function () {
})
})
it('should send 500 response', function (ctx) {
return new Promise(resolve => {
it('should send 500 response', async function (ctx) {
await new Promise(resolve => {
ctx.SubscriptionGroupHandler.promises.upgradeGroupPlan = sinon
.stub()
.rejects()