MD Settings: Hook up about_page to new LifetimeBrowserProxy.

chrome/test/data/webui/settings/about_page_tests.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('settings_about_page', function() {
   /**
    * @constructor
    * @implements {settings.AboutPageBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 125 matching lines @@
 
 
   function registerAboutPageTests() {
     /** @param {!UpdateStatus} status */
     function fireStatusChanged(status) {
       cr.webUIListenerCallback('update-status-changed', {status: status});
     }
 
     suite('AboutPageTest', function() {
       var page = null;
-      var browserProxy = null;
+
+      /** @type {?settings.TestAboutPageBrowserProxy} */
+      var aboutBrowserProxy = null;

[tommycli, 2016/06/15 16:02:35]

nit: in about_page.js this is just called browserProxy, whereas here it's named
more specifically as aboutBrowserProxy.

[dpapad, 2016/06/15 17:30:19]

Done, renamed it accordingly in about_page.js.

+
+      /** @type {?settings.TestLifetimeBrowserProxy} */
+      var lifetimeBrowserProxy = null;
+
       var SPINNER_ICON = 'chrome://resources/images/throbber_small.svg';
 
       setup(function() {
-        browserProxy = new TestAboutPageBrowserProxy();
-        settings.AboutPageBrowserProxyImpl.instance_ = browserProxy;
+        lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
+        settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
+
+        aboutBrowserProxy = new TestAboutPageBrowserProxy();
+        settings.AboutPageBrowserProxyImpl.instance_ = aboutBrowserProxy;
         return initNewPage();
       });
 
       teardown(function() {
         page.remove();
         page = null;
         loadTimeData.overrideValues({
           aboutObsoleteNowOrSoon: false,
           aboutObsoleteEndOfTheLine: false,
         });
       });
 
       /** @return {!Promise} */
       function initNewPage() {
-        browserProxy.reset();
+        aboutBrowserProxy.reset();
+        lifetimeBrowserProxy.reset();
         PolymerTest.clearBody();
         page = document.createElement('settings-about-page');
         document.body.appendChild(page);
-        return browserProxy.whenCalled('refreshUpdateStatus');
+        return aboutBrowserProxy.whenCalled('refreshUpdateStatus');
       }
 
       /**
        * Test that the status icon and status message update according to
        * incoming 'update-status-changed' events.
        */
       test('IconAndMessageUpdates', function() {
         var icon = page.$$('iron-icon');
         assertTrue(!!icon);
         var statusMessageEl = page.$.updateStatusMessage;
@@ skipping 104 matching lines @@
           assertTrue(page.$.updateStatusMessage.hidden);
 
           fireStatusChanged(UpdateStatus.UPDATED);
           assertEquals(null, icon.src);
           assertEquals('settings:error', icon.icon);
           assertFalse(page.$.deprecationWarning.hidden);
           assertTrue(page.$.updateStatusMessage.hidden);
         });
       });
 
+      test('Relaunch', function() {
+        var relaunch = page.$.relaunch;
+        assertTrue(!!relaunch);
+        assertTrue(relaunch.hidden);
+
+        fireStatusChanged(UpdateStatus.NEARLY_UPDATED);
+        assertFalse(relaunch.hidden);
+
+        MockInteractions.tap(relaunch);
+        return lifetimeBrowserProxy.whenCalled('relaunch');
+      });
+
       if (cr.isChromeOS) {
         /**
          * Test that all buttons update according to incoming
          * 'update-status-changed' events for the case where target and current
          * channel are the same.
          */
         test('ButtonsUpdate_SameChannel', function() {
           var relaunch = page.$.relaunch;
           var checkForUpdates = page.$.checkForUpdates;
           var relaunchAndPowerwash = page.$.relaunchAndPowerwash;
@@ skipping 40 matching lines @@
           fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN);
           assertAllHidden();
         });
 
         /**
          * Test that buttons update according to incoming
          * 'update-status-changed' events for the case where the target channel
          * is more stable than current channel.
          */
         test('ButtonsUpdate_BetaToStable', function() {
-          browserProxy.setChannels(BrowserChannel.BETA, BrowserChannel.STABLE);
-          browserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
+          aboutBrowserProxy.setChannels(
+              BrowserChannel.BETA, BrowserChannel.STABLE);
+          aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
             assertTrue(!!page.$.relaunch);
             assertTrue(!!page.$.relaunchAndPowerwash);
 
             assertTrue(page.$.relaunch.hidden);
             assertFalse(page.$.relaunchAndPowerwash.hidden);
+
+            MockInteractions.tap(page.$.relaunchAndPowerwash);
+            return lifetimeBrowserProxy.whenCalled('factoryReset');
           });
         });
 
         /**
          * Test that buttons update according to incoming
          * 'update-status-changed' events for the case where the target channel
          * is less stable than current channel.
          */
         test('ButtonsUpdate_StableToBeta', function() {
-          browserProxy.setChannels(BrowserChannel.STABLE, BrowserChannel.BETA);
-          browserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
+          aboutBrowserProxy.setChannels(
+              BrowserChannel.STABLE, BrowserChannel.BETA);
+          aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
             assertTrue(!!page.$.relaunch);
             assertTrue(!!page.$.relaunchAndPowerwash);
 
             assertFalse(page.$.relaunch.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
+
+            MockInteractions.tap(page.$.relaunch);
+            return lifetimeBrowserProxy.whenCalled('relaunch');
           });
         });
 
         /**
          * Test that buttons update as a result of receiving a
          * 'target-channel-changed' event (normally fired from
          * <settings-channel-switcher-dialog>).
          */
         test('ButtonsUpdate_TargetChannelChangedEvent', function() {
-          browserProxy.setChannels(BrowserChannel.BETA, BrowserChannel.BETA);
-          browserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
+          aboutBrowserProxy.setChannels(
+              BrowserChannel.BETA, BrowserChannel.BETA);
+          aboutBrowserProxy.setUpdateStatus(UpdateStatus.NEARLY_UPDATED);
 
           return initNewPage().then(function() {
             assertFalse(page.$.relaunch.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
 
             page.fire('target-channel-changed', BrowserChannel.DEV);
             assertFalse(page.$.relaunch.hidden);
             assertTrue(page.$.relaunchAndPowerwash.hidden);
 
             page.fire('target-channel-changed', BrowserChannel.STABLE);
             assertTrue(page.$.relaunch.hidden);
             assertFalse(page.$.relaunchAndPowerwash.hidden);
           });
         });
 
         test('RegulatoryInfo', function() {
           var regulatoryInfo = null;
 
           /**
            * Checks the visibility of the "regulatory info" section.
            * @param {boolean} isShowing Whether the section is expected to be
            *     visible.
            * @return {!Promise}
            */
           function checkRegulatoryInfo(isShowing) {
-            return browserProxy.whenCalled('getRegulatoryInfo').then(
+            return aboutBrowserProxy.whenCalled('getRegulatoryInfo').then(
                 function() {
                   var regulatoryInfoEl = page.$.regulatoryInfo;
                   assertTrue(!!regulatoryInfoEl);
                   assertEquals(isShowing, !regulatoryInfoEl.hidden);
 
                   if (isShowing) {
                     var img = regulatoryInfoEl.querySelector('img');
                     assertTrue(!!img);
                     assertEquals(regulatoryInfo.text, img.getAttribute('alt'));
                     assertEquals(regulatoryInfo.url, img.getAttribute('src'));
                   }
                 });
           }
 
           return checkRegulatoryInfo(false).then(function() {
             regulatoryInfo = {text: 'foo', url: 'bar'};
-            browserProxy.setRegulatoryInfo(regulatoryInfo);
+            aboutBrowserProxy.setRegulatoryInfo(regulatoryInfo);
             return initNewPage();
           }).then(function() {
             return checkRegulatoryInfo(true);
           });
         });
       }
 
       if (!cr.isChromeOS) {
         /*
          * Test that the "Relaunch" button updates according to incoming
@@ skipping 22 matching lines @@
           assertTrue(relaunch.hidden);
 
           fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN);
           assertTrue(relaunch.hidden);
         });
       }
 
       test('GetHelp', function() {
         assertTrue(!!page.$.help);
         MockInteractions.tap(page.$.help);
-        return browserProxy.whenCalled('openHelpPage');
+        return aboutBrowserProxy.whenCalled('openHelpPage');
       });
     });
   }
 
   function registerOfficialBuildTests() {
     suite('AboutPageTest_OfficialBuild', function() {
       var page = null;
       var browserProxy = null;
 
       setup(function() {
@@ skipping 191 matching lines @@
     registerTests: function() {
       if (cr.isChromeOS) {
         registerDetailedBuildInfoTests();
         registerChannelSwitcherDialogTests();
       }
       registerAboutPageTests();
     },
     registerOfficialBuildTests: registerOfficialBuildTests,
   };
 });