Merge branch 'train-106' into train-107

CHANGELOG.md

@@ -34,6 +34,21 @@
 * **forms:** replace our password advice with responsive message (#5940) r=@vbudhram,@ryanfee ([bac0c07](https://github.com/mozilla/fxa-content-server/commit/bac0c07)), closes [#5750](https://github.com/mozilla/fxa-content-server/issues/5750)
 
 
+<a name="1.106.5"></a>
+## 1.106.5 (2018-03-07)
+
+
+### Bug Fixes
+
+* **tests:** disable profile avatar test ([f5fb665](https://github.com/mozilla/fxa-content-server/commit/f5fb665))
+
+
+
+<a name="1.106.4"></a>
+## 1.106.4 (2018-03-07)
+* **token:** use the correct service (#5955) r=@vladikoff ([1197a33](https://github.com/mozilla/fxa-content-server/commit/1197a33))
+
+
 
 <a name="1.106.3"></a>
 ## 1.106.3 (2018-02-23)

app/scripts/lib/experiments/grouping-rules/token-code.js

@@ -6,6 +6,7 @@ define(function (require, exports, module) {
   'use strict';
 
   const BaseGroupingRule = require('./base');
+  const Constants = require('../../../lib/constants');
   const GROUPS = ['control', 'treatment-code', 'treatment-link'];
   const ROLLOUT_CLIENTS = {
     '3a1f53aabe17ba32': {
@@ -45,7 +46,7 @@ define(function (require, exports, module) {
         return false;
       }
 
-      if (this.get && this.get('service') === 'Sync') {
+      if (subject.service && subject.service === Constants.SYNC_SERVICE) {
         if (this.bernoulliTrial(this.SYNC_ROLLOUT_RATE, subject.uniqueUserId)) {
           return this.uniformChoice(GROUPS, subject.uniqueUserId);
         }

app/scripts/views/mixins/token-code-experiment-mixin.js

@@ -57,6 +57,7 @@ define(function (require, exports, module) {
       const subject = {
         clientId: this.relier.get('clientId'),
         isTokenCodeSupported: this.broker.getCapability('tokenCode'),
+        service: this.relier.get('service'),
       };
       return subject;
     }

app/tests/spec/lib/experiments/grouping-rules/token-code.js

@@ -19,6 +19,7 @@ define(function (require, exports, module) {
         subject = {
           experimentGroupingRules: {},
           isTokenCodeSupported: true,
+          service: null,
           uniqueUserId: 'user-id'
         };
       });
@@ -52,11 +53,11 @@ define(function (require, exports, module) {
 
       describe('with sync', () => {
         beforeEach(() => {
-          experiment.get = () => 'Sync';
+          subject.service = 'sync';
         });
 
         it('returns false if not Sync', () => {
-          experiment.get = () => 'notSync';
+          subject.service = 'notSync';
           assert.equal(experiment.choose(subject), false);
         });