| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** @fileoverview Suite of tests for the Settings basic page. */ | 5 /** @fileoverview Suite of tests for the Settings basic page. */ |
| 6 | 6 |
| 7 GEN_INCLUDE(['settings_page_browsertest.js']); | 7 GEN_INCLUDE(['settings_page_browsertest.js']); |
| 8 | 8 |
| 9 /** | 9 /** |
| 10 * @constructor | 10 * @constructor |
| 11 * @extends {SettingsPageBrowserTest} | 11 * @extends {SettingsPageBrowserTest} |
| 12 */ | 12 */ |
| 13 function SettingsBasicPageBrowserTest() {} | 13 function SettingsBasicPageBrowserTest() {} |
| 14 | 14 |
| 15 SettingsBasicPageBrowserTest.prototype = { | 15 SettingsBasicPageBrowserTest.prototype = { |
| 16 __proto__: SettingsPageBrowserTest.prototype, | 16 __proto__: SettingsPageBrowserTest.prototype, |
| 17 | 17 |
| 18 /** @override */ | 18 /** @override */ |
| 19 extraLibraries: SettingsPageBrowserTest.prototype.extraLibraries.concat([ | 19 extraLibraries: SettingsPageBrowserTest.prototype.extraLibraries.concat([ |
| 20 '../test_browser_proxy.js', | 20 '../test_browser_proxy.js', |
| 21 ]), | 21 ]), |
| 22 }; | 22 }; |
| 23 | 23 |
| 24 // Times out on debug builders because the Settings page can take several | 24 // http://crbug/738146 |
| 25 // seconds to load in a Release build and several times that in a Debug build. | 25 TEST_F('SettingsBasicPageBrowserTest', 'DISABLED_Load', function() { |
| 26 // See https://crbug.com/558434. | |
| 27 GEN('#if !defined(NDEBUG)'); | |
| 28 GEN('#define MAYBE_Load DISABLED_Load'); | |
| 29 GEN('#else'); | |
| 30 GEN('#define MAYBE_Load Load'); | |
| 31 GEN('#endif'); | |
| 32 | |
| 33 TEST_F('SettingsBasicPageBrowserTest', 'MAYBE_Load', function() { | |
| 34 // Assign |self| to |this| instead of binding since 'this' in suite() | 26 // Assign |self| to |this| instead of binding since 'this' in suite() |
| 35 // and test() will be a Mocha 'Suite' or 'Test' instance. | 27 // and test() will be a Mocha 'Suite' or 'Test' instance. |
| 36 var self = this; | 28 var self = this; |
| 37 | 29 |
| 38 /** | 30 /** |
| 39 * This fake SearchManager just hides and re-displays the sections on search. | 31 * This fake SearchManager just hides and re-displays the sections on search. |
| 40 * | 32 * |
| 41 * @implements {SearchManager} | 33 * @implements {SearchManager} |
| 42 * @extends {TestBrowserProxy} | 34 * @extends {TestBrowserProxy} |
| 43 */ | 35 */ |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 assertNotEquals(0, page.scroller.scrollTop); | 165 assertNotEquals(0, page.scroller.scrollTop); |
| 174 | 166 |
| 175 settings.navigateTo(settings.Route.ABOUT); | 167 settings.navigateTo(settings.Route.ABOUT); |
| 176 assertEquals(0, page.scroller.scrollTop); | 168 assertEquals(0, page.scroller.scrollTop); |
| 177 }); | 169 }); |
| 178 }); | 170 }); |
| 179 | 171 |
| 180 // Run all registered tests. | 172 // Run all registered tests. |
| 181 mocha.run(); | 173 mocha.run(); |
| 182 }); | 174 }); |
| OLD | NEW |