Merge pull request #632 from sharelatex/jel-plans-pricing-fix

Plans and Pricing fixes

services/web/app/coffee/Features/Subscription/SubscriptionController.coffee

@@ -30,7 +30,7 @@ module.exports = SubscriptionController =
 					plans: plans
 					gaExperiments: Settings.gaExperiments.plansPage
 					recomendedCurrency:recomendedCurrency
-					shouldABTestPlans: currentUser == null or (currentUser?.signUpDate? and currentUser.signUpDate >= (new Date('2016-10-27')))
+					shouldABTestPlans: currentUser == null or (currentUser?.signUpDate? and currentUser.signUpDate >= '2018-06-06')
 					planFeatures: planFeatures
 			user_id = AuthenticationController.getLoggedInUserId(req)
 			if user_id?

services/web/app/views/subscriptions/plans.pug

@@ -14,5 +14,5 @@ block content
 		.content.plans(ng-controller="PlansController")
 			.container(class="more-details" ng-cloak ng-if="plansVariant === 'more-details'")
 				include _plans_page_details_more
-			.container(ng-cloak ng-if="plansVariant != 'more-details'")
+			.container(ng-cloak ng-if="plansVariant === 'default' || !shouldABTestPlans")
 				include _plans_page_details_less

services/web/public/coffee/ide.coffee

@@ -88,7 +88,7 @@ define [
 		$scope.user = window.user
 
 		$scope.shouldABTestPlans = false
-		if $scope.user.signUpDate >= '2016-10-27'
+		if $scope.user.signUpDate >= '2018-06-06'
 			$scope.shouldABTestPlans = true
 
 		$scope.settings = window.userSettings

services/web/public/coffee/main/plans.coffee

@@ -210,9 +210,9 @@ define [
 			event_tracking.send 'subscription-funnel', 'plans-page', 'group-inquiry-potential'
 
 		eventLabel = (label, location) ->
-			if location && $scope.plansVariant != 'default'
+			if $scope.plansVariant && location && $scope.plansVariant != 'default'
 				label = label + '-' + location
-			if $scope.plansVariant != 'default'
+			if $scope.plansVariant && $scope.plansVariant != 'default'
 				label += '-exp-' + $scope.plansVariant
 			label
 

services/web/test/unit/coffee/Subscription/SubscriptionControllerTests.coffee

@@ -99,7 +99,11 @@ describe "SubscriptionController", ->
 				@UserGetter.getUser.callCount.should.equal 1
 				done()
 
-			it 'should decide not to AB test the plans when signed up before 2016-10-27', (done) ->
+			it 'should decide not to AB test the plans when signed up before 2018-06-06', (done) ->
+				# Users before we introduce the test may have already seen the old variant, 
+				# and so may react positively to a change rather than the variant itself. 
+				# So it's more likely to skew in favour of the change
+				# just because change makes things 'fresh'
 				@res.renderedVariables.shouldABTestPlans.should.equal false
 				done()