Merge branch 'train-95'

.travis.yml

@@ -25,6 +25,8 @@ env:
 # Ref: https://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/
 sudo: required
 dist: trusty
+group: deprecated-2017Q3
+
 
 cache:
   directories:

CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="1.95.1"></a>
+## 1.95.1 (2017-09-11)
+
+
+### Bug Fixes
+
+* **email-first:** Report flow events from /signin, /signup. ([e1d59ca](https://github.com/mozilla/fxa-content-server/commit/e1d59ca)), closes [#5455](https://github.com/mozilla/fxa-content-server/issues/5455)
+* **test:** Remove mailcheck from travis. ([883a536](https://github.com/mozilla/fxa-content-server/commit/883a536)), closes [#5309](https://github.com/mozilla/fxa-content-server/issues/5309)
+* **test:** Use the previous trusty image on Travis. ([aa943f7](https://github.com/mozilla/fxa-content-server/commit/aa943f7))
+
+### Features
+
+* **deps:** update htmlmin ([88e75da](https://github.com/mozilla/fxa-content-server/commit/88e75da))
+
+
+
 <a name="1.95.0"></a>
 # 1.95.0 (2017-09-06)
 

app/scripts/views/sign_in_password.js

@@ -7,6 +7,7 @@ define(function (require, exports, module) {
 
   const BackMixin = require('views/mixins/back-mixin');
   const Cocktail = require('cocktail');
+  const FlowEventsMixin = require('./mixins/flow-events-mixin');
   const FormPrefillMixin = require('views/mixins/form-prefill-mixin');
   const FormView = require('views/form');
   const PasswordMixin = require('views/mixins/password-mixin');
@@ -45,6 +46,7 @@ define(function (require, exports, module) {
   Cocktail.mixin(
     SignInPasswordView,
     BackMixin,
+    FlowEventsMixin,
     FormPrefillMixin,
     PasswordMixin,
     ServiceMixin,

app/scripts/views/sign_up_password.js

@@ -11,6 +11,7 @@ define(function (require, exports, module) {
   const Cocktail = require('cocktail');
   const CoppaMixin = require('views/mixins/coppa-mixin');
   const EmailOptInMixin = require('views/mixins/email-opt-in-mixin');
+  const FlowEventsMixin = require('./mixins/flow-events-mixin');
   const FormPrefillMixin = require('views/mixins/form-prefill-mixin');
   const FormView = require('views/form');
   const p = require('lib/promise');
@@ -83,6 +84,7 @@ define(function (require, exports, module) {
       required: true
     }),
     EmailOptInMixin,
+    FlowEventsMixin,
     FormPrefillMixin,
     PasswordMixin,
     ServiceMixin,

app/tests/spec/views/sign_in_password.js

@@ -34,6 +34,7 @@ define(function (require, exports, module) {
       formPrefill = new FormPrefill();
       model = new Backbone.Model({ account });
       notifier = new Notifier();
+      sinon.spy(notifier, 'trigger');
       relier = new Relier({
         service: 'sync',
         serviceName: 'Firefox Sync'
@@ -82,11 +83,13 @@ define(function (require, exports, module) {
     });
 
     describe('render', () => {
-      it('renders as expected', () => {
+      it('renders as expected, initializes flow events', () => {
         assert.include(view.$('.service').text(), 'Firefox Sync');
         assert.lengthOf(view.$('input[type=email]'), 1);
         assert.equal(view.$('input[type=email]').val(), EMAIL);
         assert.lengthOf(view.$('input[type=password]'), 1);
+        assert.isTrue(notifier.trigger.calledOnce);
+        assert.isTrue(notifier.trigger.calledWith('flow.initialize'));
       });
     });
 

app/tests/spec/views/sign_up_password.js

@@ -38,6 +38,8 @@ define(function (require, exports, module) {
       formPrefill = new FormPrefill();
       model = new Backbone.Model({ account });
       notifier = new Notifier();
+      sinon.spy(notifier, 'trigger');
+
       relier = new Relier({
         service: 'sync',
         serviceName: 'Firefox Sync'
@@ -88,7 +90,7 @@ define(function (require, exports, module) {
     });
 
     describe('render', () => {
-      it('renders as expected', () => {
+      it('renders as expected, initializes flow events', () => {
         assert.include(view.$('.service').text(), 'Firefox Sync');
         assert.lengthOf(view.$('input[type=email]'), 1);
         assert.equal(view.$('input[type=email]').val(), EMAIL);
@@ -98,6 +100,8 @@ define(function (require, exports, module) {
         assert.lengthOf(view.$('#fxa-tos'), 1);
         assert.lengthOf(view.$('#fxa-pp'), 1);
         assert.lengthOf(view.$('#marketing-email-optin'), 1);
+        assert.isTrue(notifier.trigger.calledOnce);
+        assert.isTrue(notifier.trigger.calledWith('flow.initialize'));
       });
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-content-server",
-  "version": "1.95.0",
+  "version": "1.95.1",
   "description": "Firefox Accounts Content Server",
   "scripts": {
     "build-production": "grunt build",
@@ -54,7 +54,7 @@
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-cssmin": "2.1.0",
-    "grunt-contrib-htmlmin": "2.3.0",
+    "grunt-contrib-htmlmin": "2.4.0",
     "grunt-contrib-uglify": "2.3.0",
     "grunt-file-rev": "1.0.2",
     "grunt-githash": "0.1.3",

tests/intern_travis.js

@@ -13,7 +13,6 @@ define([
     'tests/functional/sign_in',
     'tests/functional/sign_up',
     'tests/functional/settings',
-    'tests/functional/mailcheck'
   ];
 
   intern.environments = [