fix(oauth): fixes WebChannel double submit during password reset

mozilla · Oct 29, 2014 · c4ad628 · c4ad628
1 parent e90da6d
commit c4ad628
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/scripts/views/ready.js b/app/scripts/views/ready.js
@@ -61,7 +61,7 @@ function (_, BaseView, Template, Session, Xss, Strings,
       var graphic = this.$el.find('.graphic');
       graphic.addClass('pulse');
       // Finish the WebChannel flow
-      if (this.relier.get('webChannelId')) {
+      if (this.isOAuthSameBrowser() && this.relier.get('webChannelId')) {
         this.submit();
       }
 

diff --git a/tests/functional/oauth_webchannel.js b/tests/functional/oauth_webchannel.js
@@ -25,6 +25,7 @@ define([
   var user;
   var email;
   var client;
+  var ANIMATION_DELAY_MS = 1000;
   /* global window, addEventListener */
 
   /**
@@ -335,6 +336,14 @@ define([
         .findByCssSelector('#fxa-reset-password-complete-header')
         .end()
 
+        .sleep(ANIMATION_DELAY_MS)
+
+        .findByCssSelector('.error').isDisplayed()
+        .then(function (isDisplayed) {
+          assert.isFalse(isDisplayed);
+        })
+        .end()
+
         .closeCurrentWindow()
         // switch to the original window
         .switchToWindow('')