| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 | 152 |
| 153 /** @override */ | 153 /** @override */ |
| 154 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 154 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 155 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | 155 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', |
| 156 'test_browser_proxy.js', | 156 'test_browser_proxy.js', |
| 157 'certificate_manager_page_test.js', | 157 'certificate_manager_page_test.js', |
| 158 ]), | 158 ]), |
| 159 }; | 159 }; |
| 160 | 160 |
| 161 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { | 161 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { |
| 162 certificate_manager_page.registerCaTrustEditDialogTests(); | 162 certificate_manager_page.registerTests(); |
| 163 certificate_manager_page.registerDeleteDialogTests(); | |
| 164 certificate_manager_page.registerPasswordEncryptDialogTests(); | |
| 165 mocha.run(); | 163 mocha.run(); |
| 166 }); | 164 }); |
| 167 | 165 |
| 168 GEN('#if defined(OS_CHROMEOS)'); | 166 GEN('#if defined(OS_CHROMEOS)'); |
| 169 /** | 167 /** |
| 170 * Test fixture for device-page. | 168 * Test fixture for device-page. |
| 171 * @constructor | 169 * @constructor |
| 172 * @extends {CrSettingsBrowserTest} | 170 * @extends {CrSettingsBrowserTest} |
| 173 */ | 171 */ |
| 174 function CrSettingsDevicePageTest() {} | 172 function CrSettingsDevicePageTest() {} |
| (...skipping 10 matching lines...) Expand all Loading... |
| 185 '../fake_chrome_event.js', | 183 '../fake_chrome_event.js', |
| 186 'fake_settings_private.js', | 184 'fake_settings_private.js', |
| 187 'device_page_tests.js', | 185 'device_page_tests.js', |
| 188 ]), | 186 ]), |
| 189 }; | 187 }; |
| 190 | 188 |
| 191 TEST_F('CrSettingsDevicePageTest', 'DevicePage', function() { | 189 TEST_F('CrSettingsDevicePageTest', 'DevicePage', function() { |
| 192 mocha.run(); | 190 mocha.run(); |
| 193 }); | 191 }); |
| 194 GEN('#endif'); | 192 GEN('#endif'); |
| OLD | NEW |