agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-07 08:09:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20288 from overleaf/jel-plans-query-params

Browse Source 
[web] Redirect to plans variants with query params

GitOrigin-RevId: cdfb4cd02bd5aca01c0912196badf3fe38e12a38
This commit is contained in:
Jessica Lawshe
2024-09-05 07:23:10 -05:00
committed by Copybot
parent 9bc1085566
commit edd8a7211f
2 changed files with 145 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Subscription/SubscriptionController.js
+15 -4
View File
@@ -22,6 +22,7 @@ const Modules = require('../../infrastructure/Modules')
const async = require('async')
const { formatCurrencyLocalized } = require('../../util/currency')
const SubscriptionFormatters = require('./SubscriptionFormatters')
const { URLSearchParams } = require('url')
const groupPlanModalOptions = Settings.groupPlanModalOptions
const validGroupPlanModalOptions = {
@@ -69,11 +70,21 @@ async function plansPage(req, res) {
res,
'website-redesign-plans'
)
if (websiteRedesignPlansAssignment.variant !== 'default') {
const queryParamString = new URLSearchParams(req.query)?.toString()
const queryParamForRedirect = queryParamString ? '?' + queryParamString : ''
if (websiteRedesignPlansAssignment.variant === 'new-design') {
return res.redirect(302, '/user/subscription/plans-2')
} else if (websiteRedesignPlansAssignment.variant === 'light-design') {
return res.redirect(302, '/user/subscription/plans-3')
if (websiteRedesignPlansAssignment.variant === 'new-design') {
return res.redirect(
302,
'/user/subscription/plans-2' + queryParamForRedirect
)
} else if (websiteRedesignPlansAssignment.variant === 'light-design') {
return res.redirect(
302,
'/user/subscription/plans-3' + queryParamForRedirect
)
}
}
const language = req.i18n.language || 'en'
services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
+130 -24
View File
@@ -323,9 +323,11 @@ describe('SubscriptionController', function () {
describe('showLATAMBanner', function () {
describe('latam variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'latam',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'geo-pricing-latam-v2')
.resolves({
variant: 'latam',
})
})
it('should return true for Mexican users', function (done) {
this.res.render = (page, opts) => {
@@ -385,9 +387,11 @@ describe('SubscriptionController', function () {
})
describe('default variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'default',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'geo-pricing-latam-v2')
.resolves({
variant: 'default',
})
})
it('should return false', function (done) {
this.res.render = (page, opts) => {
@@ -405,9 +409,11 @@ describe('SubscriptionController', function () {
describe('localCcyAssignment', function () {
it('uses formatCurrencyLocalized when variant is enabled', function (done) {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'enabled',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'local-ccy-format-v2')
.resolves({
variant: 'enabled',
})
this.res.render = (page, opts) => {
expect(opts.formatCurrency).to.equal(
this.currency.formatCurrencyLocalized
@@ -426,6 +432,96 @@ describe('SubscriptionController', function () {
this.SubscriptionController.plansPage(this.req, this.res)
})
})
describe('website-redesign-plans test', function () {
beforeEach(function () {
this.req.query = {}
})
describe('"default" variant', function () {
// note: if test is not active, default variant is assigned
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'website-redesign-plans')
.resolves({
variant: 'default',
})
})
it('renders "default" variant', function (done) {
this.res.render = page => {
page.should.equal('subscriptions/plans')
expect(this.res.redirect).to.not.have.been.called
done()
}
this.SubscriptionController.plansPage(this.req, this.res)
})
})
describe('"new-design" variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'website-redesign-plans')
.resolves({
variant: 'new-design',
})
})
it('redirects to "new-design" variant', function (done) {
this.res.callback = () => {
expect(this.res.redirect).to.have.been.calledWith(
302,
'/user/subscription/plans-2'
)
done()
}
this.SubscriptionController.plansPage(this.req, this.res)
})
it('passes query params when redirecting to new design variant', function (done) {
this.req.query = { currency: 'USD' }
this.res.callback = () => {
expect(this.res.redirect).to.have.been.calledWith(
302,
'/user/subscription/plans-2?currency=USD'
)
done()
}
this.SubscriptionController.plansPage(this.req, this.res)
})
})
describe('"light-design" variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'website-redesign-plans')
.resolves({
variant: 'light-design',
})
})
it('renders "light-design" variant', function (done) {
this.res.callback = () => {
expect(this.res.redirect).to.have.been.calledWith(
302,
'/user/subscription/plans-3'
)
done()
}
this.SubscriptionController.plansPage(this.req, this.res)
})
it('passes query params when redirecting to new design variant', function (done) {
this.req.query = { currency: 'USD' }
this.res.callback = () => {
expect(this.res.redirect).to.have.been.calledWith(
302,
'/user/subscription/plans-3?currency=USD'
)
done()
}
this.SubscriptionController.plansPage(this.req, this.res)
})
})
})
})
describe('plansPage light touch redesign', function () {
@@ -564,9 +660,11 @@ describe('SubscriptionController', function () {
describe('showLATAMBanner', function () {
describe('latam variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'latam',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'geo-pricing-latam-v2')
.resolves({
variant: 'latam',
})
})
it('should return true for Mexican users', function (done) {
this.res.render = (page, opts) => {
@@ -626,9 +724,11 @@ describe('SubscriptionController', function () {
})
describe('default variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'default',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'geo-pricing-latam-v2')
.resolves({
variant: 'default',
})
})
it('should return false', function (done) {
this.res.render = (page, opts) => {
@@ -646,9 +746,11 @@ describe('SubscriptionController', function () {
describe('localCcyAssignment', function () {
it('uses formatCurrencyLocalized when variant is enabled', function (done) {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'enabled',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'local-ccy-format-v2')
.resolves({
variant: 'enabled',
})
this.res.render = (page, opts) => {
expect(opts.formatCurrency).to.equal(
this.currency.formatCurrencyLocalized
@@ -753,9 +855,11 @@ describe('SubscriptionController', function () {
describe('showLATAMBanner', function () {
describe('latam variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'latam',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'geo-pricing-latam-v2')
.resolves({
variant: 'latam',
})
})
it('should return true for Mexican users', function (done) {
this.res.render = (page, opts) => {
@@ -830,9 +934,11 @@ describe('SubscriptionController', function () {
})
describe('default variant', function () {
beforeEach(function () {
this.SplitTestV2Hander.promises.getAssignment.resolves({
variant: 'default',
})
this.SplitTestV2Hander.promises.getAssignment
.withArgs(this.req, this.res, 'website-redesign-plan')
.resolves({
variant: 'default',
})
})
it('should return false', function (done) {
this.res.render = (page, opts) => {