Chromium Code Reviews| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 */ | 163 */ |
| 164 function CrSettingsSiteSettingsTest() {} | 164 function CrSettingsSiteSettingsTest() {} |
| 165 | 165 |
| 166 CrSettingsSiteSettingsTest.prototype = { | 166 CrSettingsSiteSettingsTest.prototype = { |
| 167 __proto__: CrSettingsBrowserTest.prototype, | 167 __proto__: CrSettingsBrowserTest.prototype, |
| 168 | 168 |
| 169 /** @override */ | 169 /** @override */ |
| 170 browsePreload: 'chrome://md-settings/prefs/prefs.html', | 170 browsePreload: 'chrome://md-settings/prefs/prefs.html', |
| 171 | 171 |
| 172 /** @override */ | 172 /** @override */ |
| 173 preLoad: function() { | 173 preLoad: function() { |
|
dpapad
2016/03/29 21:46:33
No need to override this at all anymore. Just dele
Finnur
2016/03/30 11:22:43
Ah, of course. Done.
| |
| 174 SettingsPageBrowserTest.prototype.preLoad.call(this); | 174 SettingsPageBrowserTest.prototype.preLoad.call(this); |
| 175 | |
| 176 cr.exportPath('settings_test').siteCategoryNotifyForTest = true; | |
| 177 cr.exportPath('settings_test').siteListNotifyForTest = true; | |
| 178 }, | 175 }, |
| 179 | 176 |
| 180 /** @override */ | 177 /** @override */ |
| 181 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 178 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 182 'site_details_tests.js', | 179 'site_details_tests.js', |
| 183 'site_details_permission_tests.js', | 180 'site_details_permission_tests.js', |
| 184 'site_list_tests.js', | 181 'site_list_tests.js', |
| 185 'site_settings_category_tests.js', | 182 'site_settings_category_tests.js', |
| 186 'test_browser_proxy.js', | 183 'test_browser_proxy.js', |
| 187 'test_site_settings_prefs_browser_proxy.js', | 184 'test_site_settings_prefs_browser_proxy.js', |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | 239 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', |
| 243 'test_browser_proxy.js', | 240 'test_browser_proxy.js', |
| 244 'system_page_tests.js', | 241 'system_page_tests.js', |
| 245 ]), | 242 ]), |
| 246 }; | 243 }; |
| 247 | 244 |
| 248 TEST_F('CrSettingsSystemPageTest', 'Restart', function() { | 245 TEST_F('CrSettingsSystemPageTest', 'Restart', function() { |
| 249 mocha.run(); | 246 mocha.run(); |
| 250 }); | 247 }); |
| 251 GEN('#endif'); | 248 GEN('#endif'); |
| OLD | NEW |