MD Settings: Fix Reset profile dialog scenario that causes a crash.

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 77 matching lines @@
       //  - opens the reset profile dialog when the reset button is clicked.
       //  - the reset profile dialog is closed after reset is done.
       test(TestNames.ResetBannerReset, function() {
         var dialog = resetBanner.$$('settings-reset-profile-dialog');
         assertFalse(!!dialog);
         MockInteractions.tap(resetBanner.$['reset']);
         Polymer.dom.flush();
         dialog = resetBanner.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
 
-        dialog.dispatchEvent(new CustomEvent('reset-done'));
+        dialog.fire('reset-done');
         Polymer.dom.flush();
         assertEquals('none', dialog.style.display);
         return Promise.resolve();
       });
 
       // Tests that the reset profile banner removes itself from the DOM when
       // the close button is clicked and that |onHideResetProfileBanner| is
       // called.
       test(TestNames.ResetBannerClose, function() {
         MockInteractions.tap(resetBanner.$['close']);
@@ skipping 33 matching lines @@
        * @param {function(SettingsResetProfileDialogElemeent)}
        *     closeDialogFn A function to call for closing the dialog.
        * @return {!Promise}
        */
       function testOpenCloseResetProfileDialog(closeDialogFn) {
         resetPageBrowserProxy.resetResolver('onShowResetProfileDialog');
         resetPageBrowserProxy.resetResolver('onHideResetProfileDialog');
 
         // Open reset profile dialog.
         MockInteractions.tap(resetPage.$.resetProfile);
+        Polymer.dom.flush();
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
-        assertTrue(dialog.$.dialog.open);
         var onDialogClosed = new Promise(
             function(resolve, reject) {
               dialog.addEventListener('close', function() {
                 assertFalse(dialog.$.dialog.open);
                 resolve();
               });
             });
 
         return resetPageBrowserProxy.whenCalled(
               'onShowResetProfileDialog').then(function() {
+          assertTrue(dialog.$.dialog.open);
           closeDialogFn(dialog);
           return Promise.all([
             onDialogClosed,
             resetPageBrowserProxy.whenCalled('onHideResetProfileDialog'),
           ]);
         });
       }
 
       // Tests that the reset profile dialog opens and closes correctly and that
       // resetPageBrowserProxy calls are occurring as expected.
       test(TestNames.ResetProfileDialogOpenClose, function() {
         return testOpenCloseResetProfileDialog(function(dialog) {
           // Test case where the 'cancel' button is clicked.
           MockInteractions.tap(dialog.$.cancel);
         }).then(function() {
           return testOpenCloseResetProfileDialog(function(dialog) {
             // Test case where the 'close' button is clicked.
             MockInteractions.tap(dialog.$.dialog.getCloseButton());
           });
         });
       });
 
       // 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);
+        Polymer.dom.flush();
         var dialog = resetPage.$$('settings-reset-profile-dialog');
         assertTrue(!!dialog);
 
         var showReportedSettingsLink = dialog.$$('.footer a');
         assertTrue(!!showReportedSettingsLink);
         MockInteractions.tap(showReportedSettingsLink);
 
         return resetPageBrowserProxy.whenCalled('showReportedSettings').then(
             function() {
               assertFalse(dialog.$.reset.disabled);
               assertFalse(dialog.$.resetSpinner.active);
               MockInteractions.tap(dialog.$.reset);
               assertTrue(dialog.$.reset.disabled);
+              assertTrue(dialog.$.cancel.disabled);
               assertTrue(dialog.$.resetSpinner.active);
               return resetPageBrowserProxy.whenCalled(
                   'performResetProfileSettings');
             });
       });
 
       if (cr.isChromeOS) {
         /**
          * @param {function(SettingsPowerwashDialogElemeent):!Element}
          *     closeButtonFn A function that returns the button to be used for
          *     closing the dialog.
          * @return {!Promise}
          */
         function testOpenClosePowerwashDialog(closeButtonFn) {
           // Open powerwash dialog.
           MockInteractions.tap(resetPage.$.powerwash);
+          Polymer.dom.flush();
           var dialog = resetPage.$$('settings-powerwash-dialog');
           assertTrue(!!dialog);
           assertTrue(dialog.$.dialog.open);
           var onDialogClosed = new Promise(
             function(resolve, reject) {
               dialog.addEventListener('close', function() {
                 assertFalse(dialog.$.dialog.open);
                 resolve();
               });
             });
 
           MockInteractions.tap(closeButtonFn(dialog));
           return Promise.all([
               onDialogClosed,
               resetPageBrowserProxy.whenCalled('onPowerwashDialogShow'),
           ]);
         }
 
         // Tests that the powerwash dialog opens and closes correctly, and
         // that chrome.send calls are propagated as expected.
         test(TestNames.PowerwashDialogOpenClose, function() {
-          return Promise.all([
-            // Test case where the 'cancel' button is clicked.
-            testOpenClosePowerwashDialog(
-                function(dialog) { return dialog.$.cancel; }),
+          // Test case where the 'cancel' button is clicked.
+          return testOpenClosePowerwashDialog(function(dialog) {
+            return dialog.$.cancel;
+          }).then(function() {
             // Test case where the 'close' button is clicked.
-            testOpenClosePowerwashDialog(
-                function(dialog) { return dialog.$.dialog.getCloseButton(); }),
-          ]);
+            return testOpenClosePowerwashDialog(function(dialog) {
+              return dialog.$.dialog.getCloseButton();
+            });
+          });
         });
 
         // Tests that when powerwash is requested chrome.send calls are
         // propagated as expected.
         test(TestNames.PowerwashDialogAction, function() {
           // Open powerwash dialog.
           MockInteractions.tap(resetPage.$.powerwash);
+          Polymer.dom.flush();
           var dialog = resetPage.$$('settings-powerwash-dialog');
           assertTrue(!!dialog);
           MockInteractions.tap(dialog.$.powerwash);
           return lifetimeBrowserProxy.whenCalled('factoryReset');
         });
       }
     });
   }
 
   return {
     registerTests: function() {
       registerBannerTests();
       registerDialogTests();
     },
   };
 });