From 9d77d5be22e41f4a933530acd8ee1f44dce1c7c6 Mon Sep 17 00:00:00 2001
From: Payton Swick <payton@foolord.com>
Date: Wed, 9 Dec 2015 17:12:16 -0500
Subject: [PATCH 1/2] Signup: Verticals Survey: Disable the Verticals Survey

There were some bugs around stats collection and some strange behavior in
Firefox and iOS Chrome. We are disabling the test for now and will re-start when
things are working correctly again.
---
 client/lib/abtest/active-tests.js       |  9 ---------
 client/signup/config/flows.js           | 15 --------------
 client/signup/config/step-components.js |  4 ----
 client/signup/config/steps.js           | 26 -------------------------
 4 files changed, 54 deletions(-)

diff --git a/client/lib/abtest/active-tests.js b/client/lib/abtest/active-tests.js
index 07dafa5a75892..173c664c18fc9 100644
--- a/client/lib/abtest/active-tests.js
+++ b/client/lib/abtest/active-tests.js
@@ -16,15 +16,6 @@ module.exports = {
 		},
 		defaultVariation: 'singlePurchaseFlow'
 	},
-	verticalSurvey: {
-		datestamp: '20151202',
-		variations: {
-			noSurvey: 12,
-			oneStep: 44,
-			twoStep: 44
-		},
-		defaultVariation: 'noSurvey'
-	},
 	translatorInvitation: {
 		datestamp: '20150910',
 		variations: {
diff --git a/client/signup/config/flows.js b/client/signup/config/flows.js
index c1fdb9e12caa2..011a5ae517b9c 100644
--- a/client/signup/config/flows.js
+++ b/client/signup/config/flows.js
@@ -9,7 +9,6 @@ var assign = require( 'lodash/object/assign' ),
 */
 var config = require( 'config' ),
 	stepConfig = require( './steps' ),
-	abtest = require( 'lib/abtest' ).abtest,
 	user = require( 'lib/user' )();
 
 function getCheckoutDestination( dependencies ) {
@@ -65,20 +64,6 @@ const flows = {
 		lastModified: '2015-09-22'
 	},
 
-	'vert-blog': {
-		steps: abtest( 'verticalSurvey' ) === 'noSurvey' ? [ 'themes', 'domains', 'plans', 'user' ] : [ 'survey-blog', 'themes', 'domains', 'plans', 'survey-user' ],
-		destination: getCheckoutDestination,
-		description: 'Categorizing blog signups for Verticals Survey',
-		lastModified: null
-	},
-
-	'vert-site': {
-		steps: abtest( 'verticalSurvey' ) === 'noSurvey' ? [ 'themes', 'domains', 'plans', 'user' ] : [ 'survey-site', 'themes', 'domains', 'plans', 'survey-user' ],
-		destination: getCheckoutDestination,
-		description: 'Categorizing site signups for Verticals Survey',
-		lastModified: null
-	},
-
 	headstart: {
 		steps: [ 'theme-headstart', 'domains-with-theme', 'plans', 'user' ],
 		destination: getCheckoutDestination,
diff --git a/client/signup/config/step-components.js b/client/signup/config/step-components.js
index dfb267c67a6b6..b9a7f341f1929 100644
--- a/client/signup/config/step-components.js
+++ b/client/signup/config/step-components.js
@@ -7,7 +7,6 @@ var EmailSignupComponent = require( 'signup/steps/email-signup-form' ),
 	PlansStepComponent = require( 'signup/steps/plans' ),
 	DomainsStepComponent = require( 'signup/steps/domains' ),
 	DSSStepComponent = require( 'signup/steps/dss' ),
-	SurveyStepComponent = require( 'signup/steps/survey' ),
 	config = require( 'config' );
 
 module.exports = {
@@ -18,9 +17,6 @@ module.exports = {
 	test: config( 'env' ) === 'development' ? require( 'signup/steps/test-step' ) : undefined,
 	plans: PlansStepComponent,
 	domains: DomainsStepComponent,
-	'survey-blog': SurveyStepComponent,
-	'survey-site': SurveyStepComponent,
-	'survey-user': EmailSignupComponent,
 	'domains-with-theme': DomainsStepComponent,
 	'theme-dss': DSSStepComponent,
 	'jetpack-user': EmailSignupComponent
diff --git a/client/signup/config/steps.js b/client/signup/config/steps.js
index aa1abcf46984e..410f6d53849e1 100644
--- a/client/signup/config/steps.js
+++ b/client/signup/config/steps.js
@@ -35,32 +35,6 @@ module.exports = {
 		stepName: 'test',
 	},
 
-	'survey-user': {
-		stepName: 'survey-user',
-		apiRequestFunction: stepActions.createAccount,
-		dependencies: [ 'surveySiteType', 'surveyQuestion' ],
-		providesToken: true,
-		providesDependencies: [ 'bearer_token', 'username' ]
-	},
-
-	'survey-blog': {
-		stepName: 'survey-blog',
-		props: {
-			surveySiteType: 'blog',
-			isOneStep: abtest( 'verticalSurvey' ) === 'oneStep'
-		},
-		providesDependencies: [ 'surveySiteType', 'surveyQuestion' ]
-	},
-
-	'survey-site': {
-		stepName: 'survey-site',
-		props: {
-			surveySiteType: 'site',
-			isOneStep: abtest( 'verticalSurvey' ) === 'oneStep'
-		},
-		providesDependencies: [ 'surveySiteType', 'surveyQuestion' ]
-	},
-
 	plans: {
 		stepName: 'plans',
 		apiRequestFunction: stepActions.addPlanToCart,

From 134cc613fe1bc57b5fc3c72f10e5ead56d4867a5 Mon Sep 17 00:00:00 2001
From: kwight <kwight@kwight.ca>
Date: Wed, 9 Dec 2015 14:49:40 -0800
Subject: [PATCH 2/2] Signup: Verticals Survey: Remove unused survey values
 from user data.

---
 client/lib/signup/step-actions.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/lib/signup/step-actions.js b/client/lib/signup/step-actions.js
index b51c26dde209c..e14604f8a309a 100644
--- a/client/lib/signup/step-actions.js
+++ b/client/lib/signup/step-actions.js
@@ -103,8 +103,6 @@ module.exports = {
 				ab_test_variations: getSavedVariations(),
 				validate: false,
 				signup_flow_name: flowName,
-				nux_q_site_type: dependencies.surveySiteType,
-				nux_q_question_primary: dependencies.surveyQuestion,
 				jetpack_redirect: queryArgs.jetpackRedirect
 			}
 		), ( error, response ) => {