diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 34ba6fd99d..b24c4ee2b9 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -35,7 +35,7 @@ const HttpErrors = require('@overleaf/o-error/http') module.exports = SubscriptionController = { plansPage(req, res, next) { - const plans = SubscriptionViewModelBuilder.buildViewModel() + const plans = SubscriptionViewModelBuilder.buildPlansList() let viewName = 'subscriptions/plans' if (req.query.v != null) { viewName = `${viewName}_${req.query.v}` @@ -167,7 +167,7 @@ module.exports = SubscriptionController = { return next(error) } const fromPlansPage = req.query.hasSubscription - const plans = SubscriptionViewModelBuilder.buildViewModel() + const plans = SubscriptionViewModelBuilder.buildPlansList() const data = { title: 'your_subscription', plans, diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js index 46e5db1d9a..79cd964772 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js +++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js @@ -250,7 +250,7 @@ module.exports = { ) }, - buildViewModel() { + buildPlansList() { const { plans } = Settings const allPlans = {} diff --git a/services/web/test/acceptance/src/SubscriptionDashboardTests.js b/services/web/test/acceptance/src/SubscriptionDashboardTests.js index e0b1262d17..55e9da1e38 100644 --- a/services/web/test/acceptance/src/SubscriptionDashboardTests.js +++ b/services/web/test/acceptance/src/SubscriptionDashboardTests.js @@ -27,6 +27,15 @@ describe('Subscriptions', function() { return this.user.ensureUserExists(done) }) + it('should not list personal plan', function() { + const plans = SubscriptionViewModelBuilder.buildPlansList() + expect(plans.individualMonthlyPlans).to.be.a('Array') + const personalMonthlyPlan = plans.individualMonthlyPlans.find( + plan => plan.planCode === 'personal' + ) + expect(personalMonthlyPlan).to.be.undefined + }) + describe('when the user has no subscription', function() { beforeEach(function(done) { return SubscriptionViewModelBuilder.buildUsersSubscriptionViewModel( diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js index 85de32c838..de22cfb2a8 100644 --- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js +++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js @@ -76,7 +76,7 @@ describe('SubscriptionController', function() { this.SubscriptionViewModelBuilder = { buildUsersSubscriptionViewModel: sinon.stub().callsArgWith(1, null, {}), - buildViewModel: sinon.stub() + buildPlansList: sinon.stub() } this.settings = { coupon_codes: { @@ -339,7 +339,7 @@ describe('SubscriptionController', function() { }) } ) - this.SubscriptionViewModelBuilder.buildViewModel.returns( + this.SubscriptionViewModelBuilder.buildPlansList.returns( (this.plans = { plans: 'mock' }) ) this.LimitationsManager.userHasV1OrV2Subscription.callsArgWith(