MD Settings: Reset page, fix dialog test that was erroneously passing.

chrome/test/data/webui/settings/reset_page_test.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('settings_reset_page', function() {
   /** @enum {string} */
   var TestNames = {
     PowerwashDialogAction: 'PowerwashDialogAction',
     PowerwashDialogOpenClose: 'PowerwashDialogOpenClose',
     ResetBannerClose: 'ResetBannerClose',
@@ skipping 133 matching lines @@
        * @return {!Promise}
        */
       function testOpenCloseResetProfileDialog(closeDialogFn) {
         resetPageBrowserProxy.resetResolver('onShowResetProfileDialog');
         resetPageBrowserProxy.resetResolver('onHideResetProfileDialog');
 
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
+        assertTrue(dialog.$.dialog.opened);
         var onDialogClosed = new Promise(
             function(resolve, reject) {
-              dialog.addEventListener('iron-overlay-closed', resolve);
+              dialog.addEventListener('iron-overlay-closed', function() {
+                assertFalse(dialog.$.dialog.opened);
+                resolve();
+              });
             });
 
-        return resetPageBrowserProxy.whenCalled(
-            'onShowResetProfileDialog').then(
-            function() {
+        return new Promise(function(resolve, reject) {
+          resetPageBrowserProxy.whenCalled(
+              'onShowResetProfileDialog').then(function() {
+            // Need to call requestAnimationFrame here, otherwise the dialog has
+            // not been registered to the IronOverlayManager at the time we
+            // attempt to close it (which prevents closing by 'esc' key from
+            // working).
+            window.requestAnimationFrame(function() {
               closeDialogFn(dialog);
-              return Promise.all([
+              Promise.all([
                 onDialogClosed,
                 resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
-              ]);
+              ]).then(resolve, reject);
             });
+          });
+        });
       }
 
       // Tests that the reset profile dialog opens and closes correctly and that
       // resetPageBrowserProxy calls are occurring as expected.
       test(TestNames.ResetProfileDialogOpenClose, function() {
-        return Promise.all([
+        return testOpenCloseResetProfileDialog(function(dialog) {
           // Test case where the 'cancel' button is clicked.
-          testOpenCloseResetProfileDialog(
-              function(dialog) {
-                MockInteractions.tap(dialog.$.cancel);
-              }),
-          // Test case where the 'close' button is clicked.
-          testOpenCloseResetProfileDialog(
-              function(dialog) {
-                MockInteractions.tap(dialog.$.dialog.getCloseButton());
-              }),
-          // Test case where the 'Esc' key is pressed.
-          testOpenCloseResetProfileDialog(
-              function(dialog) {
-                MockInteractions.pressAndReleaseKeyOn(
-                    dialog, 27 /* 'Esc' key code */);
-              }),
-        ]);
+          MockInteractions.tap(dialog.$.cancel);
+        }).then(function() {
+          return testOpenCloseResetProfileDialog(function(dialog) {
+            // Test case where the 'close' button is clicked.
+            MockInteractions.tap(dialog.$.dialog.getCloseButton());
+          });
+        }).then(function() {
+          return testOpenCloseResetProfileDialog(function(dialog) {
+            // Test case where the 'Esc' key is pressed.
+            MockInteractions.pressAndReleaseKeyOn(
+                dialog, 27 /* 'Esc' key code */);
+          });
+        });
       });
 
       // Tests that when user request to reset the profile the appropriate
       // message is sent to the browser.
       test(TestNames.ResetProfileDialogAction, function() {
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
 
@@ skipping 60 matching lines @@
     });
   }
 
   return {
     registerTests: function() {
       registerBannerTests();
       registerDialogTests();
     },
   };
 });