crostini: use async in page tests

Bug: None
Change-Id: I2ffbdec3ccf5fc94118e2080df159bc78869c711
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2084034
Commit-Queue: Julian Watson <juwa@google.com>
Auto-Submit: Julian Watson <juwa@google.com>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746232}

chrome/test/data/webui/settings/chromeos/crostini_page_test.js

@@ -69,32 +69,28 @@ suite('CrostiniPageTests', function() {
       assertTrue(!!crostiniPage.$$('.subpage-arrow'));
     });
 
-    test('ButtonDisabledDuringInstall', function() {
+    test('ButtonDisabledDuringInstall', async function() {
       const button = crostiniPage.$$('#enable');
       assertTrue(!!button);
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       assertFalse(button.disabled);
       cr.webUIListenerCallback('crostini-installer-status-changed', true);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       assertTrue(button.disabled);
-            cr.webUIListenerCallback(
-                'crostini-installer-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
+      cr.webUIListenerCallback('crostini-installer-status-changed', false);
+
+      await flushAsync();
       assertFalse(button.disabled);
     });
   });
-  });
 
   suite('SubPageDetails', function() {
     /** @type {?SettingsCrostiniSubPageElement} */
     let subpage;
 
-    setup(function() {
+    setup(async function() {
       setCrostiniPrefs(true);
       loadTimeData.overrideValues({
         showCrostiniExportImport: true,
@@ -118,7 +114,7 @@ suite('CrostiniPageTests', function() {
         assertTrue(!!subpage);
       });
 
-      return Promise.all([pageLoadPromise, eventPromise]);
+      await Promise.all([pageLoadPromise, eventPromise]);
     });
 
     test('Sanity', function() {
@@ -130,14 +126,14 @@ suite('CrostiniPageTests', function() {
       assertTrue(!!subpage.$$('#crostini-port-forwarding'));
     });
 
-    test('SharedPaths', function() {
+    test('SharedPaths', async function() {
       assertTrue(!!subpage.$$('#crostini-shared-paths'));
       subpage.$$('#crostini-shared-paths').click();
-      return flushAsync().then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-shared-paths');
       assertTrue(!!subpage);
     });
-    });
 
     test('ContainerUpgrade', function() {
       assertTrue(!!subpage.$$('#container-upgrade cr-button'));
@@ -148,133 +144,117 @@ suite('CrostiniPageTests', function() {
               'requestCrostiniContainerUpgradeView'));
     });
 
-    test('ContainerUpgradeButtonDisabledOnUpgradeDialog', function() {
+    test('ContainerUpgradeButtonDisabledOnUpgradeDialog', async function() {
       const button = subpage.$$('#container-upgrade cr-button');
       assertTrue(!!button);
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       assertFalse(button.disabled);
       cr.webUIListenerCallback('crostini-upgrader-status-changed', true);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       assertTrue(button.disabled);
       cr.webUIListenerCallback('crostini-upgrader-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       assertFalse(button.disabled);
     });
-    });
 
-    test('ContainerUpgradeButtonDisabledOnInstall', function() {
+    test('ContainerUpgradeButtonDisabledOnInstall', async function() {
       const button = subpage.$$('#container-upgrade cr-button');
       assertTrue(!!button);
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       assertFalse(button.disabled);
       cr.webUIListenerCallback('crostini-installer-status-changed', true);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       assertTrue(button.disabled);
-            cr.webUIListenerCallback(
-                'crostini-installer-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
+      cr.webUIListenerCallback('crostini-installer-status-changed', false);
+
+      await flushAsync();
       assertFalse(button.disabled);
     });
-    });
 
-    test('Export', function() {
+    test('Export', async function() {
       assertTrue(!!subpage.$$('#crostini-export-import'));
       subpage.$$('#crostini-export-import').click();
-      return flushAsync().then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-export-import');
       assertTrue(!!subpage.$$('#export cr-button'));
       subpage.$$('#export cr-button').click();
       assertEquals(
           1, crostiniBrowserProxy.getCallCount('exportCrostiniContainer'));
     });
-    });
 
-    test('Import', function() {
+    test('Import', async function() {
       assertTrue(!!subpage.$$('#crostini-export-import'));
       subpage.$$('#crostini-export-import').click();
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-export-import');
       subpage.$$('#import cr-button').click();
-            return flushAsync();
-          })
-          .then(() => {
-            subpage =
-                subpage.$$('settings-crostini-import-confirmation-dialog');
+
+      await flushAsync();
+      subpage = subpage.$$('settings-crostini-import-confirmation-dialog');
       subpage.$$('cr-dialog cr-button[id="continue"]').click();
       assertEquals(
-                1,
-                crostiniBrowserProxy.getCallCount('importCrostiniContainer'));
-          });
+          1, crostiniBrowserProxy.getCallCount('importCrostiniContainer'));
     });
 
-    test('ExportImportButtonsGetDisabledOnOperationStatus', function() {
+    test('ExportImportButtonsGetDisabledOnOperationStatus', async function() {
       assertTrue(!!subpage.$$('#crostini-export-import'));
       subpage.$$('#crostini-export-import').click();
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-export-import');
       assertFalse(subpage.$$('#export cr-button').disabled);
       assertFalse(subpage.$$('#import cr-button').disabled);
       cr.webUIListenerCallback(
           'crostini-export-import-operation-status-changed', true);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-export-import');
       assertTrue(subpage.$$('#export cr-button').disabled);
       assertTrue(subpage.$$('#import cr-button').disabled);
       cr.webUIListenerCallback(
           'crostini-export-import-operation-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-export-import');
       assertFalse(subpage.$$('#export cr-button').disabled);
       assertFalse(subpage.$$('#import cr-button').disabled);
     });
-    });
 
-    test('ExportImportButtonsDisabledOnWhenInstallingCrostini', function() {
+    test(
+        'ExportImportButtonsDisabledOnWhenInstallingCrostini',
+        async function() {
           assertTrue(!!subpage.$$('#crostini-export-import'));
           subpage.$$('#crostini-export-import').click();
-      return flushAsync()
-          .then(() => {
+
+          await flushAsync();
           subpage = crostiniPage.$$('settings-crostini-export-import');
           assertFalse(subpage.$$('#export cr-button').disabled);
           assertFalse(subpage.$$('#import cr-button').disabled);
           cr.webUIListenerCallback('crostini-installer-status-changed', true);
-            return flushAsync();
-          })
-          .then(() => {
+
+          await flushAsync();
           subpage = crostiniPage.$$('settings-crostini-export-import');
           assertTrue(subpage.$$('#export cr-button').disabled);
           assertTrue(subpage.$$('#import cr-button').disabled);
-            cr.webUIListenerCallback(
-                'crostini-installer-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
+          cr.webUIListenerCallback('crostini-installer-status-changed', false);
+
+          await flushAsync();
           subpage = crostiniPage.$$('settings-crostini-export-import');
           assertFalse(subpage.$$('#export cr-button').disabled);
           assertFalse(subpage.$$('#import cr-button').disabled);
         });
-    });
 
     suite('SubPagePortForwarding', function() {
       /** @type {?SettingsCrostiniPortForwarding} */
       let subpage;
-      setup(function() {
+      setup(async function() {
         setCrostiniPrefs(true, {
           forwardedPorts: [
             {
@@ -292,17 +272,14 @@ suite('CrostiniPageTests', function() {
           ]
         });
 
-        return flushAsync()
-            .then(() => {
+        await flushAsync();
         settings.Router.getInstance().navigateTo(
             settings.routes.CROSTINI_PORT_FORWARDING);
-              return flushAsync();
-            })
-            .then(() => {
+
+        await flushAsync();
         subpage = crostiniPage.$$('settings-crostini-port-forwarding');
         assertTrue(!!subpage);
       });
-      });
 
       test('Forwarded ports are shown', function() {
         // Extra list item for the titles.
@@ -310,14 +287,12 @@ suite('CrostiniPageTests', function() {
             3, subpage.shadowRoot.querySelectorAll('.list-item').length);
       });
 
-      test('AddPortSuccess', function() {
-        return flushAsync()
-            .then(() => {
+      test('AddPortSuccess', async function() {
+        await flushAsync();
         subpage = crostiniPage.$$('settings-crostini-port-forwarding');
         subpage.$$('#addPort cr-button').click();
-              return flushAsync();
-            })
-            .then(() => {
+
+        await flushAsync();
         subpage = subpage.$$('settings-crostini-add-port-dialog');
         const portNumberInput = subpage.$$('#portNumberInput');
         portNumberInput.value = '5000';
@@ -325,19 +300,15 @@ suite('CrostiniPageTests', function() {
         portLabelInput.value = 'Some Label';
         subpage.$$('cr-dialog cr-button[id="continue"]').click();
         assertEquals(
-                  1,
-                  crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
-            });
+            1, crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
       });
 
-      test('AddPortFail', function() {
-        return flushAsync()
-            .then(() => {
+      test('AddPortFail', async function() {
+        await flushAsync();
         subpage = crostiniPage.$$('settings-crostini-port-forwarding');
         subpage.$$('#addPort cr-button').click();
-              return flushAsync();
-            })
-            .then(() => {
+
+        await flushAsync();
         subpage = subpage.$$('settings-crostini-add-port-dialog');
         const portNumberInput = subpage.$$('#portNumberInput');
         portNumberInput.value = 'INVALID_PORT_NUMBER';
@@ -345,106 +316,92 @@ suite('CrostiniPageTests', function() {
         portLabelInput.value = 'Some Label';
         subpage.$$('cr-dialog cr-button[id="continue"]').click();
         assertEquals(
-                  0,
-                  crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
+            0, crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
         portNumberInput.value = '65536';
         subpage.$$('cr-dialog cr-button[id="continue"]').click();
         assertEquals(
-                  0,
-                  crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
+            0, crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
         portNumberInput.value = '65535';
         subpage.$$('cr-dialog cr-button[id="continue"]').click();
         assertEquals(
-                  1,
-                  crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
-            });
+            1, crostiniBrowserProxy.getCallCount('addCrostiniPortForward'));
       });
 
-      test('AddPortCancel', function() {
-        return flushAsync()
-            .then(() => {
+      test('AddPortCancel', async function() {
+        await flushAsync();
         subpage = crostiniPage.$$('settings-crostini-port-forwarding');
         subpage.$$('#addPort cr-button').click();
-              return flushAsync();
-            })
-            .then(() => {
+
+        await flushAsync();
         subpage = subpage.$$('settings-crostini-add-port-dialog');
         subpage.$$('cr-dialog cr-button[id="cancel"]').click();
-              return flushAsync();
-            })
-            .then(() => {
+
+
+        await flushAsync();
         subpage = crostiniPage.$$('settings-crostini-port-forwarding');
         assertTrue(!!subpage);
       });
     });
-    });
 
-    test('Remove', function() {
+    test('Remove', async function() {
       assertTrue(!!subpage.$$('#remove cr-button'));
       subpage.$$('#remove cr-button').click();
       assertEquals(
           1, crostiniBrowserProxy.getCallCount('requestRemoveCrostini'));
       setCrostiniPrefs(false);
-      return test_util.eventToPromise('popstate', window).then(function() {
+
+      await test_util.eventToPromise('popstate', window);
       assertEquals(
           settings.Router.getInstance().getCurrentRoute(),
           settings.routes.CROSTINI);
       assertTrue(!!crostiniPage.$$('#enable'));
     });
-    });
 
-    test('RemoveHidden', function() {
-      // Elements are not destroyed when a dom-if stops being shown, but we can
-      // check if their rendered width is non-zero. This should be resilient
-      // against most formatting changes, since we're not relying on them having
-      // any exact size, or on Polymer using any particular means of hiding
-      // elements.
+    test('RemoveHidden', async function() {
+      // Elements are not destroyed when a dom-if stops being shown, but we
+      // can check if their rendered width is non-zero. This should be
+      // resilient against most formatting changes, since we're not relying on
+      // them having any exact size, or on Polymer using any particular means
+      // of hiding elements.
       assertTrue(!!subpage.shadowRoot.querySelector('#remove').clientWidth);
       cr.webUIListenerCallback('crostini-installer-status-changed', true);
-      return flushAsync()
-          .then(() => {
-            assertFalse(
-                !!subpage.shadowRoot.querySelector('#remove').clientWidth);
-            cr.webUIListenerCallback(
-                'crostini-installer-status-changed', false);
-            return flushAsync();
-          })
-          .then(() => {
-            assertTrue(
-                !!subpage.shadowRoot.querySelector('#remove').clientWidth);
-          });
+
+      await flushAsync();
+      assertFalse(!!subpage.shadowRoot.querySelector('#remove').clientWidth);
+      cr.webUIListenerCallback('crostini-installer-status-changed', false);
+
+      await flushAsync();
+      assertTrue(!!subpage.shadowRoot.querySelector('#remove').clientWidth);
     });
 
-    test('HideOnDisable', function() {
+    test('HideOnDisable', async function() {
       assertEquals(
           settings.Router.getInstance().getCurrentRoute(),
           settings.routes.CROSTINI_DETAILS);
       setCrostiniPrefs(false);
-      return test_util.eventToPromise('popstate', window).then(function() {
+
+      await test_util.eventToPromise('popstate', window);
       assertEquals(
           settings.Router.getInstance().getCurrentRoute(),
           settings.routes.CROSTINI);
     });
   });
-  });
 
   suite('SubPageSharedPaths', function() {
     let subpage;
 
-    setup(function() {
+    setup(async function() {
       setCrostiniPrefs(
           true, {sharedPaths: {path1: ['termina'], path2: ['termina']}});
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       settings.Router.getInstance().navigateTo(
           settings.routes.CROSTINI_SHARED_PATHS);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-shared-paths');
       assertTrue(!!subpage);
     });
-    });
 
     test('Sanity', function() {
       assertEquals(
@@ -452,55 +409,54 @@ suite('CrostiniPageTests', function() {
       assertEquals(2, subpage.shadowRoot.querySelectorAll('.list-item').length);
     });
 
-    test('Remove', function() {
+    test('Remove', async function() {
       assertFalse(subpage.$.crostiniInstructionsRemove.hidden);
       assertFalse(subpage.$.crostiniList.hidden);
       assertTrue(subpage.$.crostiniListEmpty.hidden);
       assertTrue(!!subpage.$$('.list-item cr-icon-button'));
+
+      {
         // Remove first shared path, still one left.
         subpage.$$('.list-item cr-icon-button').click();
-      return crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath')
-          .then(([vmName, path]) => {
+        const [vmName, path] =
+            await crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
         assertEquals('termina', vmName);
         assertEquals('path1', path);
         setCrostiniPrefs(true, {sharedPaths: {path2: ['termina']}});
-            return flushAsync();
-          })
-          .then(() => {
+      }
+
+      await flushAsync();
       Polymer.dom.flush();
-            assertEquals(
-                1, subpage.shadowRoot.querySelectorAll('.list-item').length);
+      assertEquals(1, subpage.shadowRoot.querySelectorAll('.list-item').length);
       assertFalse(subpage.$.crostiniInstructionsRemove.hidden);
 
+      {
         // Remove remaining shared path, none left.
         crostiniBrowserProxy.resetResolver('removeCrostiniSharedPath');
         subpage.$$('.list-item cr-icon-button').click();
-            return crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
-          })
-          .then(([vmName, path]) => {
+        const [vmName, path] =
+            await crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
         assertEquals('termina', vmName);
         assertEquals('path2', path);
         setCrostiniPrefs(true, {sharedPaths: {}});
-            return flushAsync();
-          })
-          .then(() => {
+      }
+
+      await flushAsync();
       Polymer.dom.flush();
-            assertEquals(
-                0, subpage.shadowRoot.querySelectorAll('.list-item').length);
+      assertEquals(0, subpage.shadowRoot.querySelectorAll('.list-item').length);
       // Verify remove instructions are hidden, and empty list message
       // is shown.
       assertTrue(subpage.$.crostiniInstructionsRemove.hidden);
       assertTrue(subpage.$.crostiniList.hidden);
       assertFalse(subpage.$.crostiniListEmpty.hidden);
     });
-    });
 
-    test('RemoveFailedRetry', function() {
+    test('RemoveFailedRetry', async function() {
       // Remove shared path fails.
       crostiniBrowserProxy.removeSharedPathResult = false;
       subpage.$$('.list-item cr-icon-button').click();
-      return crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath')
-          .then(() => {
+
+      await crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
       Polymer.dom.flush();
       assertTrue(subpage.$$('#removeSharedPathFailedDialog').open);
 
@@ -510,18 +466,15 @@ suite('CrostiniPageTests', function() {
       subpage.$$('#removeSharedPathFailedDialog')
           .querySelector('.action-button')
           .click();
-            return crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
-          })
-          .then(() => {
+      await crostiniBrowserProxy.whenCalled('removeCrostiniSharedPath');
       assertFalse(!!subpage.$$('#removeSharedPathFailedDialog'));
     });
   });
-  });
 
   suite('SubPageSharedUsbDevices', function() {
     let subpage;
 
-    setup(function() {
+    setup(async function() {
       setCrostiniPrefs(true, {
         sharedUsbDevices: [
           {shared: true, guid: '0001', name: 'usb_dev1'},
@@ -530,32 +483,28 @@ suite('CrostiniPageTests', function() {
         ]
       });
 
-      return flushAsync()
-          .then(() => {
+      await flushAsync();
       settings.Router.getInstance().navigateTo(
           settings.routes.CROSTINI_SHARED_USB_DEVICES);
-            return flushAsync();
-          })
-          .then(() => {
+
+      await flushAsync();
       subpage = crostiniPage.$$('settings-crostini-shared-usb-devices');
       assertTrue(!!subpage);
     });
-    });
 
     test('USB devices are shown', function() {
       assertEquals(3, subpage.shadowRoot.querySelectorAll('.toggle').length);
     });
 
-    test('USB shared state is updated by toggling', function() {
+    test('USB shared state is updated by toggling', async function() {
       assertTrue(!!subpage.$$('.toggle'));
       subpage.$$('.toggle').click();
-      return flushAsync()
-          .then(() => {
+
+      await flushAsync();
       Polymer.dom.flush();
-            return crostiniBrowserProxy.whenCalled(
-                'setCrostiniUsbDeviceShared');
-          })
-          .then(args => {
+
+      const args =
+          await crostiniBrowserProxy.whenCalled('setCrostiniUsbDeviceShared');
       assertEquals('0001', args[0]);
       assertEquals(false, args[1]);
 
@@ -564,9 +513,7 @@ suite('CrostiniPageTests', function() {
         {shared: true, guid: '0001', name: 'usb_dev1'},
       ]);
       Polymer.dom.flush();
-            assertEquals(
-                1, subpage.shadowRoot.querySelectorAll('.toggle').length);
-          });
+      assertEquals(1, subpage.shadowRoot.querySelectorAll('.toggle').length);
     });
   });
 });