From 768d1145761d6d3463b226d388a89d237c891a64 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 8 May 2019 08:15:52 +0100
Subject: [PATCH] chore(experiments): Remove the q3FormChanges experiment.

The experiment was removed long long ago, and we should have
been able to remove these remnants in train-113.

fixes #1040
---
 .../lib/experiments/grouping-rules/index.js   |  1 -
 .../grouping-rules/q3-form-changes.js         | 21 --------------
 .../lib/experiments/grouping-rules/index.js   |  2 +-
 .../grouping-rules/q3-form-changes.js         | 28 -------------------
 .../app/tests/spec/views/pair/index.js        |  1 -
 .../app/tests/test_start.js                   |  1 -
 6 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/q3-form-changes.js
 delete mode 100644 packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/q3-form-changes.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
index 408d66c1e3..3064ebf780 100644
--- 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
@@ -14,7 +14,6 @@ const experimentGroupingRules = [
   require('./communication-prefs'),
   require('./email-first'),
   require('./is-sampled-user'),
-  require('./q3-form-changes'),
   require('./send-sms-install-link'),
   require('./sentry'),
   require('./token-code'),
diff --git a/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/q3-form-changes.js b/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/q3-form-changes.js
deleted file mode 100644
index 0ee83f68be..0000000000
--- a/packages/fxa-content-server/app/scripts/lib/experiments/grouping-rules/q3-form-changes.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * q3FormChanges is deprecated but kept around so that the experiment name
- * still validate in the weeks after train-112 rolls out.
- * The experiment can be removed in train-113 once the numbers of people
- * reporting q3FormChanges are sufficiently low.
- */
-'use strict';
-
-const BaseGroupingRule = require('./base');
-
-module.exports = class Q3FormChanges extends BaseGroupingRule {
-  constructor () {
-    super();
-    this.deprecated = true;
-    this.name = 'q3FormChanges';
-  }
-};
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
index e6140cad11..f8e5048f22 100644
--- 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, 7);
+    assert.lengthOf(ExperimentGroupingRules.EXPERIMENT_NAMES, 6);
   });
 
   describe('choose', () => {
diff --git a/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/q3-form-changes.js b/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/q3-form-changes.js
deleted file mode 100644
index a3ab57bb74..0000000000
--- a/packages/fxa-content-server/app/tests/spec/lib/experiments/grouping-rules/q3-form-changes.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import { assert } from 'chai';
-import Account from 'models/account';
-import Experiment from 'lib/experiments/grouping-rules/q3-form-changes';
-
-describe('lib/experiments/grouping-rules/q3-form-changes', () => {
-  let account;
-  let experiment;
-
-  before(() => {
-    account = new Account();
-    experiment = new Experiment();
-  });
-
-  describe('choose', () => {
-    it('throws', () => {
-      assert.throws(() => {
-        experiment.choose({
-          account,
-          uniqueUserId: 'user-id'
-        });
-      });
-    });
-  });
-});
diff --git a/packages/fxa-content-server/app/tests/spec/views/pair/index.js b/packages/fxa-content-server/app/tests/spec/views/pair/index.js
index 5871c86028..f356976e5f 100644
--- a/packages/fxa-content-server/app/tests/spec/views/pair/index.js
+++ b/packages/fxa-content-server/app/tests/spec/views/pair/index.js
@@ -78,7 +78,6 @@ describe('views/pair/index', () => {
         uid: 'uid'
       });
       return view.render().then(() => {
-        console.log('args', view.replaceCurrentPage.args[0])
         assert.isTrue(view.replaceCurrentPage.calledOnceWith('pair/unsupported'));
       });
     });
diff --git a/packages/fxa-content-server/app/tests/test_start.js b/packages/fxa-content-server/app/tests/test_start.js
index a10f0044bb..b7adf8b76f 100644
--- a/packages/fxa-content-server/app/tests/test_start.js
+++ b/packages/fxa-content-server/app/tests/test_start.js
@@ -46,7 +46,6 @@ require('./spec/lib/experiments/grouping-rules/communication-prefs');
 require('./spec/lib/experiments/grouping-rules/email-first');
 require('./spec/lib/experiments/grouping-rules/index');
 require('./spec/lib/experiments/grouping-rules/is-sampled-user');
-require('./spec/lib/experiments/grouping-rules/q3-form-changes');
 require('./spec/lib/experiments/grouping-rules/send-sms-install-link');
 require('./spec/lib/experiments/grouping-rules/sentry');
 require('./spec/lib/experiments/grouping-rules/token-code');