Merge pull request #3387 from mozilla/email-first-remove-experiment r=@…

…vbudhram chore(email-first): Remove email-first related experiment code
mozilla · Nov 18, 2019 · 28b3857 · 28b3857
2 parents 9a6c142 + 46d9b79
commit 28b3857
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 462 deletions.
diff --git a/packages/fxa-content-server/app/scripts/lib/experiment.js b/packages/fxa-content-server/app/scripts/lib/experiment.js
@@ -20,7 +20,6 @@ const STARTUP_EXPERIMENTS = {};
  * after the app has started.
  */
 const MANUAL_EXPERIMENTS = {
-  emailFirst: BaseExperiment,
   // For now, the send SMS experiment only needs to log "enrolled", so
   // no special experiment is created.
   signupCode: BaseExperiment,

diff --git a/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/email-first.js b/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/email-first.js
diff --git a/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/index.js b/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/index.js
@@ -13,7 +13,6 @@ const _ = require('underscore');
 const experimentGroupingRules = [
   require('./communication-prefs'),
   require('./cwts-on-signup-password'),
-  require('./email-first'),
   require('./is-sampled-user'),
   require('./send-sms-install-link'),
   require('./sentry'),

diff --git a/packages/fxa-content-server/app/scripts/views/index.js b/packages/fxa-content-server/app/scripts/views/index.js
@@ -12,7 +12,6 @@ import AuthErrors from '../lib/auth-errors';
 import CachedCredentialsMixin from './mixins/cached-credentials-mixin';
 import Cocktail from 'cocktail';
 import CoppaMixin from './mixins/coppa-mixin';
-import EmailFirstExperimentMixin from './mixins/email-first-experiment-mixin';
 import FirefoxFamilyServicesTemplate from '../templates/partial/firefox-family-services.mustache';
 import TokenCodeExperimentMixin from './mixins/token-code-experiment-mixin';
 import FlowBeginMixin from './mixins/flow-begin-mixin';
@@ -69,19 +68,14 @@ class IndexView extends FormView {
 
     if (isLegacySigninSignupDisabled && action !== 'force_auth') {
       return this.chooseEmailActionPage();
-    }
-
-    if (action && action !== 'email') {
+    } else if (action === 'force_auth') {
       this.replaceCurrentPage(action);
-    } else if (
-      this.isInEmailFirstExperimentGroup('treatment') ||
-      action === 'email'
-    ) {
+    } else if (action) {
       return this.chooseEmailActionPage();
     } else if (this.getSignedInAccount().get('sessionToken')) {
       this.replaceCurrentPage('settings');
     } else {
-      this.replaceCurrentPage('signup');
+      return this.chooseEmailActionPage();
     }
   }
 
@@ -228,7 +222,6 @@ Cocktail.mixin(
   IndexView,
   CachedCredentialsMixin,
   CoppaMixin({}),
-  EmailFirstExperimentMixin(),
   TokenCodeExperimentMixin,
   FlowBeginMixin,
   FormPrefillMixin,

diff --git a/packages/fxa-content-server/app/scripts/views/mixins/email-first-experiment-mixin.js b/packages/fxa-content-server/app/scripts/views/mixins/email-first-experiment-mixin.js
diff --git a/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/email-first.js b/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/email-first.js
diff --git a/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/index.js b/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/index.js
@@ -9,7 +9,7 @@ import sinon from 'sinon';
 
 describe('lib/experiments/grouping-rules/index', () => {
   it('EXPERIMENT_NAMES is exported', () => {
-    assert.lengthOf(ExperimentGroupingRules.EXPERIMENT_NAMES, 8);
+    assert.lengthOf(ExperimentGroupingRules.EXPERIMENT_NAMES, 7);
   });
 
   describe('choose', () => {