| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 layout. */ | 5 /** @fileoverview Suite of tests for the Settings layout. */ |
| 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 SettingsUIBrowserTest() {} | 13 function SettingsUIBrowserTest() {} |
| 14 | 14 |
| 15 SettingsUIBrowserTest.prototype = { | 15 SettingsUIBrowserTest.prototype = { |
| 16 __proto__: SettingsPageBrowserTest.prototype, | 16 __proto__: SettingsPageBrowserTest.prototype, |
| 17 }; | 17 }; |
| 18 | 18 |
| 19 // Times out on debug builders and may time out on memory bots because | 19 // Times out on debug builders and may time out on memory bots because |
| 20 // the Settings page can take several seconds to load in a Release build | 20 // the Settings page can take several seconds to load in a Release build |
| 21 // and several times that in a Debug build. See https://crbug.com/558434. | 21 // and several times that in a Debug build. See https://crbug.com/558434 |
| 22 GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)'); | 22 // and http://crbug.com/711256. |
| 23 GEN('#define MAYBE_All DISABLED_All'); | |
| 24 GEN('#else'); | |
| 25 GEN('#define MAYBE_All All'); | |
| 26 GEN('#endif'); | |
| 27 | 23 |
| 28 TEST_F('SettingsUIBrowserTest', 'MAYBE_All', function() { | 24 TEST_F('SettingsUIBrowserTest', 'DISABLED_All', function() { |
| 29 suite('settings-ui', function() { | 25 suite('settings-ui', function() { |
| 30 var toolbar; | 26 var toolbar; |
| 31 var ui; | 27 var ui; |
| 32 | 28 |
| 33 suiteSetup(function() { | 29 suiteSetup(function() { |
| 34 ui = assert(document.querySelector('settings-ui')); | 30 ui = assert(document.querySelector('settings-ui')); |
| 35 ui.$.drawerTemplate.restamp = true; | 31 ui.$.drawerTemplate.restamp = true; |
| 36 }); | 32 }); |
| 37 | 33 |
| 38 setup(function() { | 34 setup(function() { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 assertEquals('foo ', urlParams.get('search')); | 152 assertEquals('foo ', urlParams.get('search')); |
| 157 | 153 |
| 158 searchField.setValue(' '); | 154 searchField.setValue(' '); |
| 159 urlParams = settings.getQueryParameters(); | 155 urlParams = settings.getQueryParameters(); |
| 160 assertFalse(urlParams.has('search')); | 156 assertFalse(urlParams.has('search')); |
| 161 }); | 157 }); |
| 162 }); | 158 }); |
| 163 | 159 |
| 164 mocha.run(); | 160 mocha.run(); |
| 165 }); | 161 }); |
| OLD | NEW |