Settings: About: Fix cros channel info.

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}
    */
   var TestAboutPageBrowserProxy = function() {
     var methodNames = [
       'pageReady',
       'refreshUpdateStatus',
       'openHelpPage',
       'openFeedbackDialog',
     ];
 
     if (cr.isChromeOS) {
       methodNames.push(
         'getCurrentChannel',
         'getTargetChannel',
         'getVersionInfo',
+        'getCanChangeChannel',
         'getRegulatoryInfo',
         'setChannel');
     }
 
     settings.TestBrowserProxy.call(this, methodNames);
 
     /** @private {!UpdateStatus} */
     this.updateStatus_ = UpdateStatus.UPDATED;
 
     if (cr.isChromeOS) {
       /** @type {!VersionInfo} */
       this.versionInfo_ = {
         arcVersion: '',
         osFirmware: '',
         osVersion: '',
       };
 
+      /** @type {boolean} */

[dpapad, 2016/12/05 18:52:27]

@private

[stevenjb, 2016/12/06 20:38:03]

Done.

+      this.canChangeChannel_ = true;
+
       /** @private {!BrowserChannel} */
       this.currentChannel_ = BrowserChannel.BETA;
 
       /** @private {!BrowserChannel} */
       this.targetChannel_ = BrowserChannel.BETA;
 
       /** @private {?RegulatoryInfo} */
       this.regulatoryInfo_ = null;
     }
   };
@@ skipping 30 matching lines @@
       this.methodCalled('openHelpPage');
     },
   };
 
   if (cr.isChromeOS) {
     /** @param {!VersionInfo} */
     TestAboutPageBrowserProxy.prototype.setVersionInfo = function(versionInfo) {
       this.versionInfo_ = versionInfo;
     };
 
+    /** @param {boolean} */
+    TestAboutPageBrowserProxy.prototype.setCanChangeChannel = function(
+        canChangeChannel) {
+      this.canChangeChannel_ = canChangeChannel;
+    };
+
     /**
      * @param {!BrowserChannel} current
      * @param {!BrowserChannel} target
      */
     TestAboutPageBrowserProxy.prototype.setChannels = function(
         current, target) {
       this.currentChannel_ = current;
       this.targetChannel_ = target;
     };
 
@@ skipping 16 matching lines @@
       return Promise.resolve(this.targetChannel_);
     };
 
     /** @override */
     TestAboutPageBrowserProxy.prototype.getVersionInfo = function() {
       this.methodCalled('getVersionInfo');
       return Promise.resolve(this.versionInfo_);
     };
 
     /** @override */
+    TestAboutPageBrowserProxy.prototype.getCanChangeChannel = function() {
+      this.methodCalled('getCanChangeChannel');
+      return Promise.resolve(this.canChangeChannel_);
+    };
+
+    /** @override */
     TestAboutPageBrowserProxy.prototype.getRegulatoryInfo = function() {
       this.methodCalled('getRegulatoryInfo');
       return Promise.resolve(this.regulatoryInfo_);
     };
 
     /** @override */
     TestAboutPageBrowserProxy.prototype.setChannel = function(
         channel, isPowerwashAllowed) {
       this.methodCalled('setChannel', [channel, isPowerwashAllowed]);
     };
@@ skipping 436 matching lines @@
             osVersion: 'dummyOsVersion',
           };
           browserProxy.setVersionInfo(versionInfo);
 
           page = document.createElement('settings-detailed-build-info');
           document.body.appendChild(page);
 
           return Promise.all([
             browserProxy.whenCalled('pageReady'),
             browserProxy.whenCalled('getVersionInfo'),
-            browserProxy.whenCalled('getCurrentChannel'),
+            browserProxy.whenCalled('getTargetChannel'),
           ]).then(function() {
             assertEquals(versionInfo.arcVersion, page.$.arcVersion.textContent);
             assertEquals(versionInfo.osVersion, page.$.osVersion.textContent);
             assertEquals(versionInfo.osFirmware, page.$.osFirmware.textContent);
           });
         });
 
         /**
          * Checks whether the "change channel" button state (enabled/disabled)
          * correctly reflects whether the user is allowed to change channel (as
          * dictated by the browser via loadTimeData boolean).
          * @param {boolean} canChangeChannel Whether to simulate the case where
          *     changing channels is allowed.

[dpapad, 2016/12/05 18:52:27]

@return {!Promise} missing

          */
         function checkChangeChannelButton(canChangeChannel) {
-          loadTimeData.overrideValues({
-            aboutCanChangeChannel: canChangeChannel
-          });
+          browserProxy.setCanChangeChannel(canChangeChannel);
           page = document.createElement('settings-detailed-build-info');
           document.body.appendChild(page);
-
-          var changeChannelButton = page.$$('paper-button');
-          assertTrue(!!changeChannelButton);
-          assertEquals(canChangeChannel, !changeChannelButton.disabled)
+          return Promise.all([
+            browserProxy.whenCalled('getCanChangeChannel'),

[dpapad, 2016/12/05 18:52:27]

Why use Promise.all() for a single Promise?

[stevenjb, 2016/12/06 20:38:03]

Done.

+          ]).then(function() {
+            var changeChannelButton = page.$$('paper-button');
+            assertTrue(!!changeChannelButton);
+            assertEquals(canChangeChannel, !changeChannelButton.disabled);
+          });
         }
 
         test('ChangeChannel_Enabled', function() {
-          checkChangeChannelButton(true);
+          return checkChangeChannelButton(true);
         });
 
         test('ChangeChannel_Disabled', function() {
-          checkChangeChannelButton(false);
+          return checkChangeChannelButton(false);
         });
       });
     }
 
     function registerChannelSwitcherDialogTests() {
       suite('ChannelSwitcherDialogTest', function() {
         var dialog = null;
         var radioButtons = null;
         var browserProxy = null;
         var currentChannel = BrowserChannel.BETA;
 
         setup(function() {
           browserProxy = new TestAboutPageBrowserProxy();
           browserProxy.setChannels(currentChannel, currentChannel);
           settings.AboutPageBrowserProxyImpl.instance_ = browserProxy;
           PolymerTest.clearBody();
           dialog = document.createElement('settings-channel-switcher-dialog');
           document.body.appendChild(dialog);
 
           radioButtons = dialog.shadowRoot.querySelectorAll(
               'paper-radio-button');
           assertEquals(3, radioButtons.length);
-          return browserProxy.whenCalled('getCurrentChannel');
+          return browserProxy.whenCalled('getTargetChannel');
         });
 
         teardown(function() { dialog.remove(); });
 
         test('Initialization', function() {
           var radioGroup = dialog.$$('paper-radio-group');
           assertTrue(!!radioGroup);
           assertTrue(!!dialog.$.warning);
           assertTrue(!!dialog.$.changeChannel);
           assertTrue(!!dialog.$.changeChannelAndPowerwash);
@@ skipping 65 matching lines @@
     registerTests: function() {
       if (cr.isChromeOS) {
         registerDetailedBuildInfoTests();
         registerChannelSwitcherDialogTests();
       }
       registerAboutPageTests();
     },
     registerOfficialBuildTests: registerOfficialBuildTests,
   };
 });