fix(test): Test login data is sent with email_verified messages.

mozilla · Jun 14, 2017 · e00f8da · e00f8da
1 parent a8142d4
commit e00f8da
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/app/scripts/models/auth_brokers/fx-sync-channel.js b/app/scripts/models/auth_brokers/fx-sync-channel.js
@@ -31,6 +31,7 @@ define(function (require, exports, module) {
      *   CAN_LINK_ACCOUNT: <specify in subclass>,
      *   CHANGE_PASSWORD: <specify in subclass>,
      *   DELETE_ACCOUNT: <specify in subclass>,
+     *   EMAIL_VERIFIED: <specify in subclass>,
      *   LOADED: <specify in subclass>,
      *   LOGIN: <specify in subclass>
      * }

diff --git a/app/scripts/models/auth_brokers/mob-android-v1.js b/app/scripts/models/auth_brokers/mob-android-v1.js
@@ -18,7 +18,8 @@ define(function (require, exports, module) {
   module.exports = FxSyncWebChannelAuthenticationBroker.extend({
     defaultCapabilities: _.extend({}, proto.defaultCapabilities, {
       chooseWhatToSyncCheckbox: false,
-      chooseWhatToSyncWebV1: false, // TODO - check this
+      // No CWTS - see https://github.com/mozilla/fxa-content-server/issues/5029#issuecomment-306928551
+      chooseWhatToSyncWebV1: false,
       openWebmailButtonVisible: false,
       sendAfterSignInConfirmationPollNotice: true,
       sendAfterSignUpConfirmationPollNotice: true,

diff --git a/app/scripts/models/auth_brokers/mob-ios-v1.js b/app/scripts/models/auth_brokers/mob-ios-v1.js
@@ -18,7 +18,8 @@ define(function (require, exports, module) {
   module.exports = FxSyncWebChannelAuthenticationBroker.extend({
     defaultCapabilities: _.extend({}, proto.defaultCapabilities, {
       chooseWhatToSyncCheckbox: false,
-      chooseWhatToSyncWebV1: false, // TODO - check this
+      // No CWTS - see https://github.com/mozilla/fxa-content-server/issues/5029#issuecomment-306928551
+      chooseWhatToSyncWebV1: false,
       openWebmailButtonVisible: false,
       sendAfterSignInConfirmationPollNotice: true,
       sendAfterSignUpConfirmationPollNotice: true,

diff --git a/app/tests/spec/models/auth_brokers/fx-sync-channel.js b/app/tests/spec/models/auth_brokers/fx-sync-channel.js
@@ -278,11 +278,29 @@ define(function (require, exports, module) {
       describe('browser supports `sendAfterSignInConfirmationPollNotice`', () => {
         it('notifies the channel of login, does not halt the flow by default', () => {
           broker.setCapability('sendAfterSignInConfirmationPollNotice', true);
+
+          account.set({
+            keyFetchToken: 'key_fetch_token',
+            sessionToken: 'session_token',
+            sessionTokenContext: 'sync',
+            uid: 'uid',
+            unwrapBKey: 'unwrap_b_key',
+            verified: true
+          });
+
           return broker.afterSignInConfirmationPoll(account)
             .then((result) => {
+              assert.ok(result);
+
               assert.isTrue(channelMock.send.calledOnce);
               assert.isTrue(channelMock.send.calledWith('email_verified'));
-              assert.ok(result);
+
+              const loginData = channelMock.send.args[0][1];
+              assert.equal(loginData.email, 'testuser@testuser.com');
+              assert.equal(loginData.sessionToken, 'session_token');
+              assert.equal(loginData.uid, 'uid');
+              assert.equal(loginData.unwrapBKey, 'unwrap_b_key');
+              assert.equal(loginData.verified, true);
             });
         });
       });
@@ -294,20 +312,38 @@ define(function (require, exports, module) {
           broker.setCapability('sendAfterSignUpConfirmationPollNotice', false);
           return broker.afterSignUpConfirmationPoll(account)
             .then((result) => {
-              assert.isFalse(channelMock.send.called);
               assert.ok(result);
+              assert.isFalse(channelMock.send.called);
             });
         });
       });
 
       describe('browser supports `sendAfterSignUpConfirmationPollNotice`', () => {
         it('notifies the channel of login, does not halt the flow by default', () => {
           broker.setCapability('sendAfterSignUpConfirmationPollNotice', true);
+
+          account.set({
+            keyFetchToken: 'key_fetch_token',
+            sessionToken: 'session_token',
+            sessionTokenContext: 'sync',
+            uid: 'uid',
+            unwrapBKey: 'unwrap_b_key',
+            verified: true
+          });
+
           return broker.afterSignUpConfirmationPoll(account)
             .then((result) => {
+              assert.ok(result);
+
               assert.isTrue(channelMock.send.calledOnce);
               assert.isTrue(channelMock.send.calledWith('email_verified'));
-              assert.ok(result);
+
+              const loginData = channelMock.send.args[0][1];
+              assert.equal(loginData.email, 'testuser@testuser.com');
+              assert.equal(loginData.sessionToken, 'session_token');
+              assert.equal(loginData.uid, 'uid');
+              assert.equal(loginData.unwrapBKey, 'unwrap_b_key');
+              assert.equal(loginData.verified, true);
             });
         });
       });