Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: chrome/test/data/webui/settings/cr_settings_browsertest.js

Issue 2687553003: MD Settings: Fix site data details regression and add test. (Closed)
Patch Set: Fix types and compilation. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 656 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
657 'category_default_setting_tests.js', 657 'category_default_setting_tests.js',
658 'category_setting_exceptions_tests.js', 658 'category_setting_exceptions_tests.js',
659 'site_details_tests.js', 659 'site_details_tests.js',
660 'site_details_permission_tests.js', 660 'site_details_permission_tests.js',
661 'site_list_tests.js', 661 'site_list_tests.js',
662 'test_browser_proxy.js', 662 'test_browser_proxy.js',
663 'test_site_settings_prefs_browser_proxy.js', 663 'test_site_settings_prefs_browser_proxy.js',
664 'zoom_levels_tests.js', 664 'zoom_levels_tests.js',
665 'usb_devices_tests.js', 665 'usb_devices_tests.js',
666 'protocol_handlers_tests.js' 666 'protocol_handlers_tests.js',
667 'site_data_details_subpage_tests.js',
667 ]), 668 ]),
668 }; 669 };
669 670
670 TEST_F('CrSettingsSiteSettingsTest', 'SiteSettings', function() { 671 TEST_F('CrSettingsSiteSettingsTest', 'SiteSettings', function() {
671 category_default_setting.registerTests(); 672 category_default_setting.registerTests();
672 category_setting_exceptions.registerTests(); 673 category_setting_exceptions.registerTests();
673 site_details.registerTests(); 674 site_details.registerTests();
674 site_details_permission.registerTests(); 675 site_details_permission.registerTests();
675 site_list.registerTests(); 676 site_list.registerTests();
676 zoom_levels.registerTests(); 677 zoom_levels.registerTests();
677 usb_devices.registerTests(); 678 usb_devices.registerTests();
678 protocol_handlers.registerTests(); 679 protocol_handlers.registerTests();
680 site_data_details.registerTests();
dpapad 2017/02/08 00:04:10 It is unfortunate that I have to use registerTests
tommycli 2017/02/08 19:28:40 I probably would revert the URL change in the tear
dpapad 2017/02/08 22:01:09 Done. Thanks for the help.
679 681
680 mocha.run(); 682 mocha.run();
681 }); 683 });
682 684
683 GEN('#if defined(OS_CHROMEOS)'); 685 GEN('#if defined(OS_CHROMEOS)');
684 /** 686 /**
685 * Test fixture for device-page. 687 * Test fixture for device-page.
686 * @constructor 688 * @constructor
687 * @extends {CrSettingsBrowserTest} 689 * @extends {CrSettingsBrowserTest}
688 */ 690 */
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 1199 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
1198 'test_browser_proxy.js', 1200 'test_browser_proxy.js',
1199 'test_extension_control_browser_proxy.js', 1201 'test_extension_control_browser_proxy.js',
1200 'extension_controlled_indicator_tests.js', 1202 'extension_controlled_indicator_tests.js',
1201 ]), 1203 ]),
1202 }; 1204 };
1203 1205
1204 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() { 1206 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() {
1205 mocha.run(); 1207 mocha.run();
1206 }); 1208 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698