Chromium Code Reviews| Index: chrome/test/data/webui/settings/settings_page_browsertest.js |
| diff --git a/chrome/test/data/webui/settings/settings_page_browsertest.js b/chrome/test/data/webui/settings/settings_page_browsertest.js |
| index 52b1fb3f5c9259b22f85c19866979962a3cad4f3..fa1de9bc0d9ca3b15c41ee4e99c885ea8d9c586f 100644 |
| --- a/chrome/test/data/webui/settings/settings_page_browsertest.js |
| +++ b/chrome/test/data/webui/settings/settings_page_browsertest.js |
| @@ -32,12 +32,21 @@ SettingsPageBrowserTest.prototype = { |
| /** @override */ |
| runAccessibilityChecks: false, |
| + /** @type {?SettingsBasicPageElement} */ |
| + page: null, |
|
Dan Beam
2017/03/17 00:30:05
basicPage
dpapad
2017/03/17 20:53:55
Done.
|
| + |
| /** @override */ |
| setUp: function() { |
| PolymerTest.prototype.setUp.call(this); |
| suiteSetup(function() { |
| return CrSettingsPrefs.initialized; |
| }); |
| + |
| + suiteSetup(function() { |
| + return this.getPage('basic').then(function(basicPage) { |
| + this.page = basicPage; |
| + }.bind(this)); |
| + }.bind(this)); |
| }, |
| /** |
| @@ -62,12 +71,14 @@ SettingsPageBrowserTest.prototype = { |
| var pageType = 'settings-' + type + '-page'; |
| var page = settingsMain.$$(pageType); |
| assertTrue(!!page); |
| - var idleRender = page.$$('template[is=settings-idle-render]'); |
| - if (idleRender) { |
| - idleRender.get(); |
| - Polymer.dom.flush(); |
| - } |
| - return page; |
| + |
| + var idleRender = page.$$('template[is=settings-idle-load]'); |
| + if (!idleRender) |
| + return Promise.resolve(page); |
|
Dan Beam
2017/03/17 00:30:05
var page = settingsMain.$$(pageType);
var idleRen
dpapad
2017/03/17 20:53:55
Done.
|
| + |
| + return idleRender.get().then(function() { |
| + return page; |
| + }); |
| }, |
| /** |