| 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 Runs the Polymer Settings tests. */ | 5 /** @fileoverview Runs the Polymer Settings tests. */ |
| 6 | 6 |
| 7 /** @const {string} Path to source root. */ | 7 /** @const {string} Path to source root. */ |
| 8 var ROOT_PATH = '../../../../../'; | 8 var ROOT_PATH = '../../../../../'; |
| 9 | 9 |
| 10 // Polymer BrowserTest fixture. | 10 // Polymer BrowserTest fixture. |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 /** @override */ | 152 /** @override */ |
| 153 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 153 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 154 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | 154 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', |
| 155 'certificate_manager_page_test.js', | 155 'certificate_manager_page_test.js', |
| 156 ]), | 156 ]), |
| 157 }; | 157 }; |
| 158 | 158 |
| 159 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { | 159 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { |
| 160 certificate_manager_page.registerCaTrustEditDialogTests(); | 160 certificate_manager_page.registerCaTrustEditDialogTests(); |
| 161 certificate_manager_page.registerDeleteDialogTests(); |
| 161 mocha.run(); | 162 mocha.run(); |
| 162 }); | 163 }); |
| 163 | 164 |
| 164 GEN('#if defined(OS_CHROMEOS)'); | 165 GEN('#if defined(OS_CHROMEOS)'); |
| 165 /** | 166 /** |
| 166 * Test fixture for device-page. | 167 * Test fixture for device-page. |
| 167 * @constructor | 168 * @constructor |
| 168 * @extends {CrSettingsBrowserTest} | 169 * @extends {CrSettingsBrowserTest} |
| 169 */ | 170 */ |
| 170 function CrSettingsDevicePageTest() {} | 171 function CrSettingsDevicePageTest() {} |
| (...skipping 10 matching lines...) Expand all Loading... |
| 181 '../fake_chrome_event.js', | 182 '../fake_chrome_event.js', |
| 182 'fake_settings_private.js', | 183 'fake_settings_private.js', |
| 183 'device_page_tests.js', | 184 'device_page_tests.js', |
| 184 ]), | 185 ]), |
| 185 }; | 186 }; |
| 186 | 187 |
| 187 TEST_F('CrSettingsDevicePageTest', 'DevicePage', function() { | 188 TEST_F('CrSettingsDevicePageTest', 'DevicePage', function() { |
| 188 mocha.run(); | 189 mocha.run(); |
| 189 }); | 190 }); |
| 190 GEN('#endif'); | 191 GEN('#endif'); |
| OLD | NEW |