krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated tests to have no redirect to homes (#8494)

Browse Source
This commit is contained in:
Keith Holliday
2017-02-16 16:33:49 -07:00
committed by GitHub
parent 2f9ff92cbd
commit e37ad420ce
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/payments/paypal/GET-payments_paypal_checkout.test.js
View File

@@ -31,7 +31,7 @@ describe('payments : paypal #checkout', () => {
balance: 2, balance: 2,
}); });
await user.get(endpoint); await user.get(`${endpoint}?noRedirect=true`);
expect(checkoutStub).to.be.calledOnce; expect(checkoutStub).to.be.calledOnce;
expect(checkoutStub.args[0][0].gift).to.eql(undefined); expect(checkoutStub.args[0][0].gift).to.eql(undefined);

2
test/api/v3/integration/payments/paypal/GET-payments_paypal_checkout_success.test.js
View File

@@ -53,7 +53,7 @@ describe('payments : paypal #checkoutSuccess', () => {
balance: 2, balance: 2,
}); });
await user.get(`${endpoint}?PayerID=${customerId}&paymentId=${paymentId}`); await user.get(`${endpoint}?PayerID=${customerId}&paymentId=${paymentId}&noRedirect=true`);
expect(checkoutSuccessStub).to.be.calledOnce; expect(checkoutSuccessStub).to.be.calledOnce;

2
test/api/v3/integration/payments/paypal/GET-payments_paypal_subscribe.test.js
View File

@@ -44,7 +44,7 @@ describe('payments : paypal #subscribe', () => {
balance: 2, balance: 2,
}); });
await user.get(`${endpoint}?sub=${subKey}`); await user.get(`${endpoint}?sub=${subKey}&noRedirect=true`);
expect(subscribeStub).to.be.calledOnce; expect(subscribeStub).to.be.calledOnce;

2
test/api/v3/integration/payments/paypal/GET-payments_paypal_subscribe_cancel.test.js
View File

@@ -41,7 +41,7 @@ describe('payments : paypal #subscribeCancel', () => {
balance: 2, balance: 2,
}); });
await user.get(endpoint); await user.get(`${endpoint}?noRedirect=true`);
expect(subscribeCancelStub).to.be.calledOnce; expect(subscribeCancelStub).to.be.calledOnce;

2
test/api/v3/integration/payments/paypal/GET-payments_paypal_subscribe_success.test.js
View File

@@ -42,7 +42,7 @@ describe('payments : paypal #subscribeSuccess', () => {
balance: 2, balance: 2,
}); });
await user.get(`${endpoint}?token=${token}`); await user.get(`${endpoint}?token=${token}&noRedirect=true`);
expect(subscribeSuccessStub).to.be.calledOnce; expect(subscribeSuccessStub).to.be.calledOnce;

30
website/server/controllers/top-level/payments/paypal.js
View File

@@ -29,7 +29,11 @@ api.checkout = {
let link = await paypalPayments.checkout({gift}); let link = await paypalPayments.checkout({gift});
res.redirect(link); if (req.query.noRedirect) {
res.respond(200);
} else {
res.redirect(link);
}
}, },
}; };
@@ -55,7 +59,11 @@ api.checkoutSuccess = {
await paypalPayments.checkoutSuccess({user, gift, paymentId, customerId}); await paypalPayments.checkoutSuccess({user, gift, paymentId, customerId});
res.redirect('/'); if (req.query.noRedirect) {
res.respond(200);
} else {
res.redirect('/');
}
}, },
}; };
@@ -80,7 +88,11 @@ api.subscribe = {
req.session.paypalBlock = req.query.sub; req.session.paypalBlock = req.query.sub;
req.session.groupId = req.query.groupId; req.session.groupId = req.query.groupId;
res.redirect(link); if (req.query.noRedirect) {
res.respond(200);
} else {
res.redirect(link);
}
}, },
}; };
@@ -108,7 +120,11 @@ api.subscribeSuccess = {
await paypalPayments.subscribeSuccess({user, block, groupId, token, headers: req.headers}); await paypalPayments.subscribeSuccess({user, block, groupId, token, headers: req.headers});
res.redirect('/'); if (req.query.noRedirect) {
res.respond(200);
} else {
res.redirect('/');
}
}, },
}; };
@@ -128,7 +144,11 @@ api.subscribeCancel = {
await paypalPayments.subscribeCancel({user, groupId}); await paypalPayments.subscribeCancel({user, groupId});
res.redirect('/'); if (req.query.noRedirect) {
res.respond(200);
} else {
res.redirect('/');
}
}, },
}; };