| 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 /** | 5 /** |
| 6 * @fileoverview Suite of tests to ensure that settings subpages exist and | 6 * @fileoverview Suite of tests to ensure that settings subpages exist and |
| 7 * load without errors. Also outputs approximate load times for each subpage. | 7 * load without errors. Also outputs approximate load times for each subpage. |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 GEN_INCLUDE(['settings_page_browsertest.js']); | 10 GEN_INCLUDE(['settings_page_browsertest.js']); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 if (cr.isChromeOS) | 89 if (cr.isChromeOS) |
| 90 this.subPages.push('internet', 'bluetooth', 'device'); | 90 this.subPages.push('internet', 'bluetooth', 'device'); |
| 91 else | 91 else |
| 92 this.subPages.push('defaultBrowser'); | 92 this.subPages.push('defaultBrowser'); |
| 93 } | 93 } |
| 94 | 94 |
| 95 SettingsBasicSubPageBrowserTest.prototype = { | 95 SettingsBasicSubPageBrowserTest.prototype = { |
| 96 __proto__: SettingsSubPageBrowserTest.prototype, | 96 __proto__: SettingsSubPageBrowserTest.prototype, |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 TEST_F('SettingsBasicSubPageBrowserTest', 'SubPages', function() { | 99 // Failing on ChromiumOS dbg. https://crbug.com/709442 |
| 100 GEN('#if defined(OS_CHROMEOS) && !defined(NDEBUG)'); |
| 101 GEN('#define MAYBE_SubPages DISABLED_SubPages'); |
| 102 GEN('#else'); |
| 103 GEN('#define MAYBE_SubPages SubPages'); |
| 104 GEN('#endif'); |
| 105 TEST_F('SettingsBasicSubPageBrowserTest', 'MAYBE_SubPages', function() { |
| 100 suiteSetup(this.verifySubPagesHidden_.bind(this)); | 106 suiteSetup(this.verifySubPagesHidden_.bind(this)); |
| 101 suite('Basic', this.testSubPages.bind(this)); | 107 suite('Basic', this.testSubPages.bind(this)); |
| 102 mocha.run(); | 108 mocha.run(); |
| 103 }); | 109 }); |
| 104 | 110 |
| 105 /** @constructor @extends {SettingsSubPageBrowserTest} */ | 111 /** @constructor @extends {SettingsSubPageBrowserTest} */ |
| 106 function SettingsAdvancedSubPageBrowserTest() { | 112 function SettingsAdvancedSubPageBrowserTest() { |
| 107 // "Advanced" sections live in the settings-basic-page. | 113 // "Advanced" sections live in the settings-basic-page. |
| 108 SettingsSubPageBrowserTest.call(this, 'basic'); | 114 SettingsSubPageBrowserTest.call(this, 'basic'); |
| 109 | 115 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 131 this.toggleAdvanced(); | 137 this.toggleAdvanced(); |
| 132 SettingsSubPageBrowserTest.prototype.setUp.call(this); | 138 SettingsSubPageBrowserTest.prototype.setUp.call(this); |
| 133 }, | 139 }, |
| 134 }; | 140 }; |
| 135 | 141 |
| 136 TEST_F('SettingsAdvancedSubPageBrowserTest', 'SubPages', function() { | 142 TEST_F('SettingsAdvancedSubPageBrowserTest', 'SubPages', function() { |
| 137 suiteSetup(this.verifySubPagesHidden_.bind(this)); | 143 suiteSetup(this.verifySubPagesHidden_.bind(this)); |
| 138 suite('Advanced', this.testSubPages.bind(this)); | 144 suite('Advanced', this.testSubPages.bind(this)); |
| 139 mocha.run(); | 145 mocha.run(); |
| 140 }); | 146 }); |
| OLD | NEW |