Revert "Plans: Remove freeTrials a/b test"

client/components/plans/plan-actions/index.jsx

@@ -1,8 +1,7 @@
 /**
  * External dependencies
  */
-var config = require( 'config' ),
-	React = require( 'react' ),
+var React = require( 'react' ),
 	classNames = require( 'classnames' );
 
 /**
@@ -13,6 +12,7 @@ var analytics = require( 'analytics' ),
 	isFreePlan = productsValues.isFreePlan,
 	isBusiness = productsValues.isBusiness,
 	isEnterprise = productsValues.isEnterprise,
+	getABTestVariation = require( 'lib/abtest' ).getABTestVariation,
 	cartItems = require( 'lib/cart-values' ).cartItems,
 	puchasesPaths = require( 'me/purchases/paths' );
 
@@ -154,7 +154,11 @@ module.exports = React.createClass( {
 	},
 
 	shouldOfferFreeTrial: function() {
-		if ( ! config.isEnabled( 'upgrades/free-trials' ) || ! this.props.enableFreeTrials ) {
+		if ( getABTestVariation( 'freeTrials' ) !== 'offered' ) {
+			return false;
+		}
+
+		if ( ! this.props.enableFreeTrials ) {
 			return false;
 		}
 

client/components/plans/plans-compare/index.jsx

@@ -2,7 +2,6 @@
  * External dependencies
  */
 var React = require( 'react' ),
-	config = require( 'config' ),
 	connect = require( 'react-redux' ).connect,
 	page = require( 'page' ),
 	classNames = require( 'classnames' ),
@@ -13,6 +12,7 @@ var React = require( 'react' ),
  * Internal dependencies
  */
 var observe = require( 'lib/mixins/data-observe' ),
+	getABTestVariation = require( 'lib/abtest' ).getABTestVariation,
 	SidebarNavigation = require( 'my-sites/sidebar-navigation' ),
 	PlanFeatures = require( 'components/plans/plan-features' ),
 	PlanHeader = require( 'components/plans/plan-header' ),
@@ -108,7 +108,7 @@ var PlansCompare = React.createClass( {
 				? this.props.sitePlans.data.some( property( 'canStartTrial' ) )
 				: false;
 
-		if ( ! config.isEnabled( 'upgrades/free-trials' ) ) {
+		if ( getABTestVariation( 'freeTrials' ) !== 'offered' ) {
 			return false;
 		}
 

client/lib/abtest/active-tests.js

@@ -45,6 +45,14 @@ module.exports = {
 		},
 		defaultVariation: 'original'
 	},
+	freeTrials: {
+		datestamp: '20160112',
+		variations: {
+			notOffered: 90,
+			offered: 10
+		},
+		defaultVariation: 'notOffered'
+	},
 	monthlyPlanPricing: {
 		datestamp: '20160118',
 		variations: {

client/my-sites/plans/main.jsx

@@ -2,14 +2,14 @@
  * External dependencies
  */
 var React = require( 'react' ),
-	config = require( 'config' ),
 	connect = require( 'react-redux' ).connect,
 	find = require( 'lodash/collection/find' );
 
 /**
  * Internal dependencies
  */
 var analytics = require( 'analytics' ),
+	getABTestVariation = require( 'lib/abtest' ).getABTestVariation,
 	observe = require( 'lib/mixins/data-observe' ),
 	PlanList = require( 'components/plans/plan-list' ),
 	PlanOverview = require( './plan-overview' ),
@@ -76,7 +76,7 @@ var Plans = React.createClass( {
 			businessPlan,
 			premiumPlan;
 
-		if ( ! this.props.sitePlans.hasLoadedFromServer || ! config.isEnabled( 'upgrades/free-trials' ) ) {
+		if ( ! this.props.sitePlans.hasLoadedFromServer || getABTestVariation( 'freeTrials' ) !== 'offered' ) {
 			return null;
 		}
 

client/signup/controller.js

@@ -11,8 +11,10 @@ import isEmpty from 'lodash/lang/isEmpty';
 /**
  * Internal Dependencies
  */
+import { abtest } from 'lib/abtest';
 import i18n from 'lib/mixins/i18n';
 import config from 'config';
+import { defaultFlowName } from 'signup/config/flows';
 import route from 'lib/route';
 import analytics from 'analytics';
 import layoutFocus from 'lib/layout-focus';
@@ -69,6 +71,10 @@ export default {
 	},
 
 	redirectToFlow( context, next ) {
+		if ( utils.getFlowName( context.params ) === defaultFlowName && abtest( 'freeTrials' ) === 'offered' ) {
+			return page.redirect( utils.getValidPath( { flowName: 'free-trial' } ) );
+		}
+
 		if ( context.path !== utils.getValidPath( context.params ) ) {
 			return page.redirect( utils.getValidPath( context.params ) );
 		}

client/signup/steps/plans/index.jsx

@@ -9,6 +9,7 @@ var React = require( 'react' ),
  * Internal dependencies
  */
 var productsList = require( 'lib/products-list' )(),
+	getABTestVariation = require( 'lib/abtest' ).getABTestVariation,
 	analytics = require( 'analytics' ),
 	featuresList = require( 'lib/features-list' )(),
 	plansList = require( 'lib/plans-list' )(),
@@ -108,7 +109,7 @@ module.exports = React.createClass( {
 		let headerText = this.translate( 'Pick a plan that\'s right for you.' ),
 			subHeaderText;
 
-		if ( this.isFreeTrialFlow() ) {
+		if ( this.isFreeTrialFlow() && getABTestVariation( 'freeTrials' ) === 'offered' ) {
 			subHeaderText = this.translate(
 				'Try WordPress.com Premium or Business free for 14 days, no credit card required.'
 			);

config/development.json

@@ -94,7 +94,6 @@
 		"upgrades/domain-management/site-redirect": true,
 		"upgrades/domain-management/transfer": true,
 		"upgrades/domain-search": true,
-		"upgrades/free-trials": true,
 
 		"manage/customize": true,
 

config/wpcalypso.json

@@ -69,7 +69,6 @@
 		"upgrades/domain-management/site-redirect": true,
 		"upgrades/domain-management/transfer": true,
 		"upgrades/domain-search": true,
-		"upgrades/free-trials": true,
 
 		"notifications2beta": true,
 		"muse": true,