MD Settings: Deflake attempt for CrSettingsPrivacyPageTest.PrivacyPage.

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

 // Copyright 2016 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('certificate_manager_page', function() {
   /**
    * A test version of CertificatesBrowserProxy. Provides helper methods
    * for allowing tests to know when a method was called, as well as
    * specifying mock responses.
    *
@@ skipping 164 matching lines @@
    * Triggers an 'input' event on the given text input field (which triggers
    * validation to occur for password fields being tested in this file).
    * @param {!PaperInputElement} element
    */
   function triggerInputEvent(element) {
     // The actual key code is irrelevant for tests.
     var kSpaceBar = 32;
     MockInteractions.keyEventOn(element, 'input', kSpaceBar);
   }
 
-  /**
-   * Converts an event occurrence to a promise.
-   * @param {string} eventType
-   * @param {!HTMLElement} target
-   * @return {!Promise} A promise firing once the event occurs.
-   */
-  function eventToPromise(eventType, target) {
-    return new Promise(function(resolve, reject) {
-      target.addEventListener(eventType, resolve);
-    });
-  }
-
   function registerCaTrustEditDialogTests() {
     /** @type {?SettingsCaTrustEditDialogElement} */
     var dialog = null;
 
     /** @type {?TestCertificatesBrowserProxy} */
     var browserProxy = null;
 
     /** @type {!CaTrustInfo} */
     var caTrustInfo = { ssl: true, email: false, objSign: false };
 
@@ skipping 60 matching lines @@
               assertTrue(args.email);
               assertFalse(args.objSign);
             });
       });
 
       test('EditError', function() {
         dialog.model = createSampleCertificateSubnode();
         document.body.appendChild(dialog);
         browserProxy.forceCertificatesError();
 
-        var whenErrorEventFired = eventToPromise('certificates-error', dialog);
+        var whenErrorEventFired =
+            test_util.eventToPromise('certificates-error', dialog);
 
         return browserProxy.whenCalled('getCaCertificateTrust').then(
             function() {
               MockInteractions.tap(dialog.$.ok);
               return browserProxy.whenCalled('editCaCertificateTrust');
             }).then(
             function() {
               return whenErrorEventFired;
             });
       });
@@ skipping 36 matching lines @@
         return browserProxy.whenCalled('deleteCertificate').then(
             function(id) {
               assertEquals(model.id, id);
               // Check that the dialog is closed.
               assertFalse(dialog.$.dialog.open);
             });
       });
 
       test('DeleteError', function() {
         browserProxy.forceCertificatesError();
-        var whenErrorEventFired = eventToPromise('certificates-error', dialog);
+        var whenErrorEventFired =
+            test_util.eventToPromise('certificates-error', dialog);
 
         // Simulate clicking 'OK'.
         MockInteractions.tap(dialog.$.ok);
         return browserProxy.whenCalled('deleteCertificate').then(
             function(id) {
               assertEquals(model.id, id);
               // Ensure that the 'error' event was fired.
               return whenErrorEventFired;
             });
       });
@@ skipping 62 matching lines @@
         browserProxy.forceCertificatesError();
 
         var passwordInputElements =
             Polymer.dom(dialog.$.dialog).querySelectorAll('paper-input');
         var passwordInputElement = passwordInputElements[0];
         passwordInputElement.value = 'foopassword';
         var confirmPasswordInputElement = passwordInputElements[1];
         confirmPasswordInputElement.value = passwordInputElement.value;
         triggerInputEvent(passwordInputElement);
 
-        var whenErrorEventFired = eventToPromise('certificates-error', dialog);
+        var whenErrorEventFired =
+            test_util.eventToPromise('certificates-error', dialog);
         MockInteractions.tap(dialog.$.ok);
 
         return browserProxy.whenCalled(methodName).then(function() {
           return whenErrorEventFired;
         });
       });
     });
   }
 
   function registerPasswordDecryptDialogTests() {
@@ skipping 42 matching lines @@
       });
 
       test('DecryptError', function() {
         browserProxy.forceCertificatesError();
         // Simulate entering some password.
         var passwordInputElement =
             Polymer.dom(dialog.$.dialog).querySelector('paper-input');
         passwordInputElement.value = 'foopassword';
         triggerInputEvent(passwordInputElement);
 
-        var whenErrorEventFired = eventToPromise('certificates-error', dialog);
+        var whenErrorEventFired =
+            test_util.eventToPromise('certificates-error', dialog);
         MockInteractions.tap(dialog.$.ok);
         return browserProxy.whenCalled(methodName).then(function() {
           return whenErrorEventFired;
         });
       });
     });
   }
 
   function registerCertificateSubentryTests() {
     var subentry = null;
 
     /** @type {?TestCertificatesBrowserProxy} */
     var browserProxy = null;
 
     /**
      * @return {!Promise} A promise firing once a
      *     |settings.CertificateActionEvent| fires.
      */
     var actionEventToPromise = function() {
-      return eventToPromise(settings.CertificateActionEvent, subentry);
+      return test_util.eventToPromise(
+          settings.CertificateActionEvent, subentry);
     };
 
     suite('CertificateSubentryTests', function() {
       setup(function() {
         browserProxy = new TestCertificatesBrowserProxy();
         settings.CertificatesBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
         subentry = document.createElement('settings-certificate-subentry');
         subentry.model = createSampleCertificateSubnode();
         subentry.certificateType = CertificateType.PERSONAL;
@@ skipping 204 matching lines @@
        * @param {CertificateActionEventDetail} eventDetail
        * @return {!Promise}
        */
       function testDialogOpensOnAction(dialogTagName, eventDetail)  {
         assertFalse(!!page.shadowRoot.querySelector(dialogTagName));
         page.fire(settings.CertificateActionEvent, eventDetail);
         Polymer.dom.flush();
         var dialog = page.shadowRoot.querySelector(dialogTagName);
         assertTrue(!!dialog);
 
-        if (dialog.$.dialog.open)
-          return Promise.resolve();
-
         // Some dialogs are opened after some async operation to fetch initial
-        // data. Ensure that the underlying cr-dialog is actually opened by
-        // listening for changes for the 'open' attribute.
-        return new Promise(function(resolve, reject) {
-          var observer = new MutationObserver(function(mutations) {
-            assertEquals(1, mutations.length);
-            assertEquals('attributes', mutations[0].type);
-            assertEquals('open', mutations[0].attributeName);
-            observer.disconnect();
-            resolve();
-          });
-          observer.observe(
-              dialog.$.dialog,
-              {attributes: true, childList: false, characterData: false});
-        });
+        // data. Ensure that the underlying cr-dialog is actually opened before
+        // returning.
+        return test_util.whenAttributeIs(dialog.$.dialog, 'open', true);
       }
 
       test('OpensDialog_DeleteConfirmation', function() {
         return testDialogOpensOnAction(
             'settings-certificate-delete-confirmation-dialog',
             /** @type {!CertificateActionEventDetail} */ ({
               action: CertificateAction.DELETE,
               subnode: createSampleCertificateSubnode(),
               certificateType: CertificateType.PERSONAL
             }));
@@ skipping 70 matching lines @@
        */
       function testImportForCertificateType(
           certificateType, proxyMethodName, actionEventExpected) {
         element.certificateType = certificateType
         Polymer.dom.flush();
 
         var importButton = element.$$('paper-button');
         assertTrue(!!importButton);
 
         var waitForActionEvent = actionEventExpected ?
-            eventToPromise(settings.CertificateActionEvent, element) :
+            test_util.eventToPromise(settings.CertificateActionEvent, element) :
             Promise.resolve(null);
 
         MockInteractions.tap(importButton);
         return browserProxy.whenCalled(proxyMethodName).then(function() {
           return waitForActionEvent;
         }).then(function(event) {
           if (actionEventExpected) {
             assertEquals(
                 CertificateAction.IMPORT, event.detail.action);
             assertEquals(certificateType, event.detail.certificateType);
@@ skipping 25 matching lines @@
       registerCaTrustEditDialogTests();
       registerDeleteDialogTests();
       registerPasswordEncryptDialogTests();
       registerPasswordDecryptDialogTests();
       registerPageTests();
       registerCertificateSubentryTests();
       registerCertificateListTests();
     },
   };
 });