| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 function CrSettingsAboutPageTest() {} | 131 function CrSettingsAboutPageTest() {} |
| 132 | 132 |
| 133 CrSettingsAboutPageTest.prototype = { | 133 CrSettingsAboutPageTest.prototype = { |
| 134 __proto__: CrSettingsBrowserTest.prototype, | 134 __proto__: CrSettingsBrowserTest.prototype, |
| 135 | 135 |
| 136 /** @override */ | 136 /** @override */ |
| 137 browsePreload: 'chrome://md-settings/about_page/about_page.html', | 137 browsePreload: 'chrome://md-settings/about_page/about_page.html', |
| 138 | 138 |
| 139 /** @override */ | 139 /** @override */ |
| 140 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 140 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 141 'test_util.js', |
| 141 'test_browser_proxy.js', | 142 'test_browser_proxy.js', |
| 142 'test_lifetime_browser_proxy.js', | 143 'test_lifetime_browser_proxy.js', |
| 143 'about_page_tests.js', | 144 'about_page_tests.js', |
| 144 ]), | 145 ]), |
| 145 }; | 146 }; |
| 146 | 147 |
| 147 TEST_F('CrSettingsAboutPageTest', 'AboutPage', function() { | 148 TEST_F('CrSettingsAboutPageTest', 'AboutPage', function() { |
| 148 settings_about_page.registerTests(); | 149 settings_about_page.registerTests(); |
| 149 mocha.run(); | 150 mocha.run(); |
| 150 }); | 151 }); |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 | 432 |
| 432 CrSettingsCertificateManagerTest.prototype = { | 433 CrSettingsCertificateManagerTest.prototype = { |
| 433 __proto__: CrSettingsBrowserTest.prototype, | 434 __proto__: CrSettingsBrowserTest.prototype, |
| 434 | 435 |
| 435 /** @override */ | 436 /** @override */ |
| 436 browsePreload: 'chrome://md-settings/certificate_manager_page/' + | 437 browsePreload: 'chrome://md-settings/certificate_manager_page/' + |
| 437 'certificate_manager_page.html', | 438 'certificate_manager_page.html', |
| 438 | 439 |
| 439 /** @override */ | 440 /** @override */ |
| 440 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 441 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 442 'test_util.js', |
| 441 'test_browser_proxy.js', | 443 'test_browser_proxy.js', |
| 442 'certificate_manager_page_test.js', | 444 'certificate_manager_page_test.js', |
| 443 ]), | 445 ]), |
| 444 }; | 446 }; |
| 445 | 447 |
| 446 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { | 448 TEST_F('CrSettingsCertificateManagerTest', 'CertificateManager', function() { |
| 447 certificate_manager_page.registerTests(); | 449 certificate_manager_page.registerTests(); |
| 448 mocha.run(); | 450 mocha.run(); |
| 449 }); | 451 }); |
| 450 GEN('#endif'); | 452 GEN('#endif'); |
| 451 | 453 |
| 452 /** | 454 /** |
| 453 * Test fixture for chrome/browser/resources/settings/privacy_page/. | 455 * Test fixture for chrome/browser/resources/settings/privacy_page/. |
| 454 * @constructor | 456 * @constructor |
| 455 * @extends {CrSettingsBrowserTest} | 457 * @extends {CrSettingsBrowserTest} |
| 456 */ | 458 */ |
| 457 function CrSettingsPrivacyPageTest() {} | 459 function CrSettingsPrivacyPageTest() {} |
| 458 | 460 |
| 459 CrSettingsPrivacyPageTest.prototype = { | 461 CrSettingsPrivacyPageTest.prototype = { |
| 460 __proto__: CrSettingsBrowserTest.prototype, | 462 __proto__: CrSettingsBrowserTest.prototype, |
| 461 | 463 |
| 462 /** @override */ | 464 /** @override */ |
| 463 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', | 465 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
| 464 | 466 |
| 465 /** @override */ | 467 /** @override */ |
| 466 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ | 468 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| 467 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | 469 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', |
| 470 'test_util.js', |
| 468 'test_browser_proxy.js', | 471 'test_browser_proxy.js', |
| 469 'privacy_page_test.js', | 472 'privacy_page_test.js', |
| 470 ]), | 473 ]), |
| 471 }; | 474 }; |
| 472 | 475 |
| 473 // TODO(crbug.com/642574) Disabled because test is flaky. | 476 TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPage', function() { |
| 474 TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPage', function() { | |
| 475 settings_privacy_page.registerTests(); | 477 settings_privacy_page.registerTests(); |
| 476 mocha.run(); | 478 mocha.run(); |
| 477 }); | 479 }); |
| 478 | 480 |
| 479 /** | 481 /** |
| 480 * Test fixture for chrome/browser/resources/settings/site_settings/. | 482 * Test fixture for chrome/browser/resources/settings/site_settings/. |
| 481 * @constructor | 483 * @constructor |
| 482 * @extends {CrSettingsBrowserTest} | 484 * @extends {CrSettingsBrowserTest} |
| 483 */ | 485 */ |
| 484 function CrSettingsSiteSettingsTest() {} | 486 function CrSettingsSiteSettingsTest() {} |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 'test_browser_proxy.js', | 847 'test_browser_proxy.js', |
| 846 'metrics_reporting_tests.js', | 848 'metrics_reporting_tests.js', |
| 847 ]), | 849 ]), |
| 848 }; | 850 }; |
| 849 | 851 |
| 850 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { | 852 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { |
| 851 mocha.run(); | 853 mocha.run(); |
| 852 }); | 854 }); |
| 853 | 855 |
| 854 GEN('#endif'); | 856 GEN('#endif'); |
| OLD | NEW |