Chromium Code Reviews| Index: chrome/test/data/webui/settings/appearance_page_test.js |
| diff --git a/chrome/test/data/webui/settings/appearance_page_test.js b/chrome/test/data/webui/settings/appearance_page_test.js |
| index 2e08fb5db526986c3ceac32d2a30c7989a6d18b4..4aceea22cb37833e3faf0ac51f97d71e9fb00f96 100644 |
| --- a/chrome/test/data/webui/settings/appearance_page_test.js |
| +++ b/chrome/test/data/webui/settings/appearance_page_test.js |
| @@ -9,6 +9,7 @@ |
| */ |
| var TestAppearanceBrowserProxy = function() { |
| settings.TestBrowserProxy.call(this, [ |
| + 'getDefaultZoom', |
| 'getThemeInfo', |
| 'isSupervised', |
| 'openWallpaperManager', |
| @@ -21,9 +22,18 @@ TestAppearanceBrowserProxy.prototype = { |
| __proto__: settings.TestBrowserProxy.prototype, |
| /** @private */ |
| + defaultZoom_: 1, |
|
dpapad
2016/11/10 02:38:34
Can me move this within the constructor instead? I
Dan Beam
2016/11/10 02:52:38
Done, but is this request based on a style rule or
dpapad
2016/11/10 17:57:46
Both. https://google.github.io/styleguide/javascri
Dan Beam
2016/11/10 18:54:36
interesting that the style guide calls this out ex
|
| + |
| + /** @private */ |
| isSupervised_: false, |
| /** @override */ |
| + getDefaultZoom: function() { |
| + this.methodCalled('getDefaultZoom'); |
| + return Promise.resolve(this.defaultZoom_); |
| + }, |
| + |
| + /** @override */ |
| getThemeInfo: function(themeId) { |
| this.methodCalled('getThemeInfo', themeId); |
| return Promise.resolve({name: 'Sports car red'}); |
| @@ -50,6 +60,11 @@ TestAppearanceBrowserProxy.prototype = { |
| this.methodCalled('useSystemTheme'); |
| }, |
| + /** @param {number} defaultZoom */ |
| + setDefaultZoom: function(defaultZoom) { |
| + this.defaultZoom_ = defaultZoom; |
| + }, |
| + |
| /** @param {boolean} Whether the user is supervised */ |
| setIsSupervised: function(isSupervised) { |
| this.isSupervised_ = isSupervised; |
| @@ -61,28 +76,32 @@ var appearancePage = null; |
| /** @type {?TestAppearanceBrowserProxy} */ |
| var appearanceBrowserProxy = null; |
| +function createAppearancePage() { |
| + PolymerTest.clearBody(); |
| + |
| + appearancePage = document.createElement('settings-appearance-page'); |
|
dpapad
2016/11/10 02:38:34
Nit(optional): Would "appearancePage.prefs = " als
Dan Beam
2016/11/10 02:52:38
there's a few things I could do to attempt to simu
|
| + appearancePage.set('prefs', { |
| + extensions: { |
| + theme: { |
| + id: { |
| + value: '', |
| + }, |
| + use_system: { |
| + value: false, |
| + }, |
| + }, |
| + }, |
| + }); |
| + |
| + document.body.appendChild(appearancePage); |
| + Polymer.dom.flush(); |
| +} |
| + |
| suite('AppearanceHandler', function() { |
| setup(function() { |
| appearanceBrowserProxy = new TestAppearanceBrowserProxy(); |
| settings.AppearanceBrowserProxyImpl.instance_ = appearanceBrowserProxy; |
| - |
| - PolymerTest.clearBody(); |
| - |
| - appearancePage = document.createElement('settings-appearance-page'); |
| - appearancePage.set('prefs', { |
| - extensions: { |
| - theme: { |
| - id: { |
| - value: '', |
| - }, |
| - use_system: { |
| - value: false, |
| - }, |
| - }, |
| - }, |
| - }); |
| - document.body.appendChild(appearancePage); |
| - Polymer.dom.flush(); |
| + createAppearancePage(); |
| }); |
| teardown(function() { appearancePage.remove(); }); |
| @@ -175,4 +194,36 @@ suite('AppearanceHandler', function() { |
| return appearanceBrowserProxy.whenCalled('useDefaultTheme'); |
| }); |
| } |
| + |
| + test('default zoom handling', function() { |
| + function getDefaultZoomText() { |
| + var zoomLevel = appearancePage.$.zoomLevel; |
| + return zoomLevel.options[zoomLevel.selectedIndex].textContent.trim(); |
| + } |
| + |
| + return appearanceBrowserProxy.whenCalled('getDefaultZoom').then(function() { |
| + assertEquals('100%', getDefaultZoomText()); |
| + |
| + appearanceBrowserProxy.setDefaultZoom(2 / 3); |
| + appearanceBrowserProxy.reset(); |
|
dpapad
2016/11/10 02:38:33
Perhaps move that call within createAppearancePage
Dan Beam
2016/11/10 02:52:38
Done.
|
| + createAppearancePage(); |
| + return appearanceBrowserProxy.whenCalled('getDefaultZoom'); |
| + }).then(function() { |
| + assertEquals('67%', getDefaultZoomText()); |
| + |
| + appearanceBrowserProxy.setDefaultZoom(11 / 10); |
| + appearanceBrowserProxy.reset(); |
| + createAppearancePage(); |
| + return appearanceBrowserProxy.whenCalled('getDefaultZoom'); |
| + }).then(function() { |
| + assertEquals('110%', getDefaultZoomText()); |
| + |
| + appearanceBrowserProxy.setDefaultZoom(1.7499999999999); |
| + appearanceBrowserProxy.reset(); |
| + createAppearancePage(); |
| + return appearanceBrowserProxy.whenCalled('getDefaultZoom'); |
| + }).then(function() { |
| + assertEquals('175%', getDefaultZoomText()); |
| + }); |
| + }); |
| }); |