Merge remote-tracking branch 'origin/train-110'

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="1.110.3"></a>
+## 1.110.3 (2018-04-25)
+
+
+### Bug Fixes
+
+* **test:** fix totp test failures (#6117) r=@vladikoff,@jrgm ([e38e282](https://github.com/mozilla/fxa-content-server/commit/e38e282)), closes [(#6117](https://github.com/(/issues/6117)
+
+
+
 <a name="1.110.2"></a>
 ## 1.110.2 (2018-04-25)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fxa-content-server",
-  "version": "1.110.2",
+  "version": "1.110.3",
   "description": "Firefox Accounts Content Server",
   "scripts": {
     "build-production": "NODE_ENV=production grunt build",

tests/functional/lib/helpers.js

@@ -187,6 +187,21 @@ const click = thenify(function (selector, readySelector) {
   // Sometimes clicks do not register if the element is in the middle of an animation.
     .then(visibleByQSA(selector))
     .click()
+    .then(null, (err) => {
+      // If element is obsure (possibly by a verification message covering it), attempt
+      // to scroll to the top of page where it might be visible.
+      if (/obscures it/.test(err.message)) {
+        return this.parent
+          .execute(() => {
+            window.scrollTo(0, 0);
+          })
+          .findByCssSelector(selector)
+          .click()
+          .end();
+      }
+      // re-throw other errors
+      throw err;
+    })
     .end()
     .then(function () {
       if (readySelector) {

tests/functional/oauth_sign_in.js

@@ -29,6 +29,7 @@ const {
   clearBrowserState,
   click,
   closeCurrentWindow,
+  confirmTotpCode,
   createUser,
   fillOutSignIn,
   fillOutSignInUnblock,
@@ -319,11 +320,7 @@ registerSuite('oauth - TOTP', {
   tests: {
     'can add TOTP to account and confirm oauth signin': function () {
       return this.remote
-      // Shows success for confirming token
-        .then(type(selectors.TOTP.CONFIRM_CODE_INPUT, generateCode(secret)))
-        .then(click(selectors.TOTP.CONFIRM_CODE_BUTTON))
-        .then(testSuccessWasShown)
-        .then(testElementExists(selectors.TOTP.STATUS_ENABLED))
+        .then(confirmTotpCode(secret))
 
         .then(clearBrowserState({
           '123done': true,
@@ -343,10 +340,7 @@ registerSuite('oauth - TOTP', {
 
     'can remove TOTP from account and skip confirmation': function () {
       return this.remote
-        .then(type(selectors.TOTP.CONFIRM_CODE_INPUT, generateCode(secret)))
-        .then(click(selectors.TOTP.CONFIRM_CODE_BUTTON))
-        .then(testSuccessWasShown)
-        .then(testElementExists(selectors.TOTP.STATUS_ENABLED))
+        .then(confirmTotpCode(secret))
 
         // Remove token
         .then(click(selectors.TOTP.DELETE_BUTTON))