From f845bbd7a0607e4d42d3626bf30eac951bce878f Mon Sep 17 00:00:00 2001 From: SabreCat Date: Sun, 22 Jan 2023 22:30:48 -0600 Subject: [PATCH] fix(payments): address some test failures --- test/api/unit/libs/payments/amazon/checkout.test.js | 12 +++++++----- test/api/unit/libs/payments/apple.test.js | 8 ++++---- test/api/unit/libs/payments/google.test.js | 8 ++++---- website/server/libs/payments/apple.js | 3 +-- website/server/libs/payments/google.js | 3 +-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/api/unit/libs/payments/amazon/checkout.test.js b/test/api/unit/libs/payments/amazon/checkout.test.js index 02402b14a9..12013e26a1 100644 --- a/test/api/unit/libs/payments/amazon/checkout.test.js +++ b/test/api/unit/libs/payments/amazon/checkout.test.js @@ -17,7 +17,7 @@ describe('Amazon Payments - Checkout', () => { let closeOrderReferenceSpy; let paymentBuyGemsStub; - let paymentCreateSubscritionStub; + let paymentCreateSubscriptionStub; let amount = gemsBlock.price / 100; function expectOrderReferenceSpy () { @@ -85,8 +85,8 @@ describe('Amazon Payments - Checkout', () => { paymentBuyGemsStub = sinon.stub(payments, 'buyGems'); paymentBuyGemsStub.resolves({}); - paymentCreateSubscritionStub = sinon.stub(payments, 'createSubscription'); - paymentCreateSubscritionStub.resolves({}); + paymentCreateSubscriptionStub = sinon.stub(payments, 'createSubscription'); + paymentCreateSubscriptionStub.resolves({}); sinon.stub(common, 'uuid').returns('uuid-generated'); sandbox.stub(gems, 'validateGiftMessage'); @@ -109,6 +109,7 @@ describe('Amazon Payments - Checkout', () => { user, paymentMethod, headers, + sku: undefined, }; if (gift) { expectedArgs.gift = gift; @@ -215,13 +216,14 @@ describe('Amazon Payments - Checkout', () => { }); gift.member = receivingUser; - expect(paymentCreateSubscritionStub).to.be.calledOnce; - expect(paymentCreateSubscritionStub).to.be.calledWith({ + expect(paymentCreateSubscriptionStub).to.be.calledOnce; + expect(paymentCreateSubscriptionStub).to.be.calledWith({ user, paymentMethod: amzLib.constants.PAYMENT_METHOD_GIFT, headers, gift, gemsBlock: undefined, + sku: undefined, }); expectAmazonStubs(); }); diff --git a/test/api/unit/libs/payments/apple.test.js b/test/api/unit/libs/payments/apple.test.js index 6bd779cb3b..95c2f20640 100644 --- a/test/api/unit/libs/payments/apple.test.js +++ b/test/api/unit/libs/payments/apple.test.js @@ -36,7 +36,7 @@ describe('Apple Payments', () => { productId: 'com.habitrpg.ios.Habitica.21gems', transactionId: token, }]); - paymentBuyGemsStub = sinon.stub(payments, 'buyGems').resolves({}); + paymentBuyGemsStub = sinon.stub(payments, 'buySkuItem').resolves({}); validateGiftMessageStub = sinon.stub(gems, 'validateGiftMessage'); }); @@ -45,7 +45,7 @@ describe('Apple Payments', () => { iap.validate.restore(); iap.isValidated.restore(); iap.getPurchaseData.restore(); - payments.buyGems.restore(); + payments.buySkuItem.restore(); gems.validateGiftMessage.restore(); }); @@ -97,8 +97,8 @@ describe('Apple Payments', () => { await expect(applePayments.verifyPurchase({ user, receipt, headers })) .to.eventually.be.rejected.and.to.eql({ - httpCode: 401, - name: 'NotAuthorized', + httpCode: 400, + name: 'BadRequest', message: applePayments.constants.RESPONSE_INVALID_ITEM, }); diff --git a/test/api/unit/libs/payments/google.test.js b/test/api/unit/libs/payments/google.test.js index 4ddbe52fc8..1108088e8d 100644 --- a/test/api/unit/libs/payments/google.test.js +++ b/test/api/unit/libs/payments/google.test.js @@ -31,7 +31,7 @@ describe('Google Payments', () => { .resolves({}); iapIsValidatedStub = sinon.stub(iap, 'isValidated') .returns(true); - paymentBuyGemsStub = sinon.stub(payments, 'buyGems').resolves({}); + paymentBuyGemsStub = sinon.stub(payments, 'buySkuItem').resolves({}); validateGiftMessageStub = sinon.stub(gems, 'validateGiftMessage'); }); @@ -39,7 +39,7 @@ describe('Google Payments', () => { iap.setup.restore(); iap.validate.restore(); iap.isValidated.restore(); - payments.buyGems.restore(); + payments.buySkuItem.restore(); gems.validateGiftMessage.restore(); }); @@ -65,8 +65,8 @@ describe('Google Payments', () => { user, receipt, signature, headers, })) .to.eventually.be.rejected.and.to.eql({ - httpCode: 401, - name: 'NotAuthorized', + httpCode: 400, + name: 'BadRequest', message: googlePayments.constants.RESPONSE_INVALID_ITEM, }); }); diff --git a/website/server/libs/payments/apple.js b/website/server/libs/payments/apple.js index 61cf05f87d..bc99889587 100644 --- a/website/server/libs/payments/apple.js +++ b/website/server/libs/payments/apple.js @@ -9,7 +9,6 @@ import { } from '../errors'; import { model as IapPurchaseReceipt } from '../../models/iapPurchaseReceipt'; import { model as User } from '../../models/user'; -import { buySkuItem } from './skuItem'; const api = {}; @@ -62,7 +61,7 @@ api.verifyPurchase = async function verifyPurchase (options) { userId: user._id, }); - await buySkuItem({ // eslint-disable-line no-await-in-loop + await payments.buySkuItem({ // eslint-disable-line no-await-in-loop user, gift, paymentMethod: api.constants.PAYMENT_METHOD_APPLE, diff --git a/website/server/libs/payments/google.js b/website/server/libs/payments/google.js index c4e7976552..d61c16a5eb 100644 --- a/website/server/libs/payments/google.js +++ b/website/server/libs/payments/google.js @@ -9,7 +9,6 @@ import { import { model as IapPurchaseReceipt } from '../../models/iapPurchaseReceipt'; import { model as User } from '../../models/user'; import { validateGiftMessage } from './gems'; -import { buySkuItem } from './skuItem'; const api = {}; @@ -62,7 +61,7 @@ api.verifyPurchase = async function verifyPurchase (options) { userId: user._id, }); - await buySkuItem({ // eslint-disable-line no-await-in-loop + await payments.buySkuItem({ // eslint-disable-line no-await-in-loop user, gift, paymentMethod: api.constants.PAYMENT_METHOD_GOOGLE,