Merge pull request #6766 from mozilla/recovery-key-experiment-simplify r=@vbudhram

chore(recovery-key): Remove all recovery key experiment code.

Author: Shane Tomlinson

app/scripts/lib/experiments/grouping-rules/index.js

@@ -18,7 +18,6 @@ const experimentGroupingRules = [
   require('./send-sms-install-link'),
   require('./sentry'),
   require('./token-code'),
-  require('./recovery-key')
 ].map(ExperimentGroupingRule => new ExperimentGroupingRule());
 
 class ExperimentChoiceIndex {

app/scripts/lib/experiments/grouping-rules/recovery-key.js

@@ -121,8 +121,6 @@ define(function (require, exports, module) {
         this._isForceAuth = this._isForceAuthUrl();
         this.importSearchParamsUsingSchema(QUERY_PARAMETER_SCHEMA, AuthErrors);
 
-        this.setCapability('showAccountRecovery', !! this.getSearchParam('showAccountRecovery'));
-
         if (this.hasCapability('fxaStatus')) {
           return this._fetchFxaStatus();
         }
@@ -487,10 +485,6 @@ define(function (require, exports, module) {
        * on subsequent signin attempts rather than generating a new token each time?
        */
       reuseExistingSession: false,
-      /**
-       * Should account recovery be enabled.
-       */
-      showAccountRecovery: false,
       /**
        * Is signup supported? the fx_ios_v1 broker can disable it.
        */

app/scripts/models/auth_brokers/base.js

@@ -18,7 +18,6 @@ import PulseGraphicMixin from './mixins/pulse-graphic-mixin';
 import ServiceMixin from './mixins/service-mixin';
 import Template from 'templates/ready.mustache';
 import VerificationReasonMixin from './mixins/verification-reason-mixin';
-import RecoverykeyExperiment from './mixins/recovery-key-experiment-mixin';
 
 const t = msg => msg;
 
@@ -162,7 +161,6 @@ Cocktail.mixin(
   FlowEventsMixin,
   MarketingMixin({ marketingId: Constants.MARKETING_ID_SPRING_2015 }),
   PulseGraphicMixin,
-  RecoverykeyExperiment,
   ServiceMixin,
   VerificationReasonMixin
 );

app/scripts/views/mixins/recovery-key-experiment-mixin.js

@@ -8,7 +8,6 @@ import SettingsPanelMixin from '../../mixins/settings-panel-mixin';
 import Template from 'templates/settings/account_recovery/account_recovery.mustache';
 import showProgressIndicator from '../../decorators/progress_indicator';
 import LastCheckedTimeMixin from '../../mixins/last-checked-time-mixin';
-import RecoveryKeyExperimentMixin from '../../mixins/recovery-key-experiment-mixin';
 import UpgradeSessionMixin from '../../mixins/upgrade-session-mixin';
 
 const t = msg => msg;
@@ -42,28 +41,12 @@ const View = BaseView.extend({
     this.navigate('settings/account_recovery/confirm_revoke');
   },
 
-  _isPanelEnabled() {
-    if (this.broker.hasCapability('showAccountRecovery')) {
-      return true;
-    }
-
-    if (this.getRecoveryKeyExperimentGroup() === 'treatment') {
-      return true;
-    }
-
-    return false;
-  },
-
   initialize() {
     this.listenTo(this.model, 'change:hasRecoveryKey', this.render);
   },
 
   beforeRender() {
     const account = this.getSignedInAccount();
-    if (! this._isPanelEnabled()) {
-      return this.remove();
-    }
-
     return this.setupSessionGateIfRequired()
       .then(() => {
         return account.checkRecoveryKeyExists()
@@ -97,7 +80,6 @@ Cocktail.mixin(
   }),
   SettingsPanelMixin,
   LastCheckedTimeMixin,
-  RecoveryKeyExperimentMixin
 );
 
 module.exports = View;

app/scripts/views/ready.js

@@ -12,7 +12,7 @@ define(function (require, exports, module) {
 
   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', () => {

app/scripts/views/settings/account_recovery/account_recovery.js

@@ -197,7 +197,6 @@ describe('views/ready', function () {
     it('shows `Create recovery key` if in recoveryKey `treatment`', () => {
       createView(VerificationReasons.PASSWORD_RESET);
       sinon.stub(view, 'isPasswordReset').callsFake(() => true);
-      sinon.stub(view, 'getRecoveryKeyExperimentGroup').callsFake(() => 'treatment');
 
       return view.render()
         .then(() => {