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

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

Issue 2454023002: MD Settings: Fix <select> search highlighting. (Closed)
Patch Set: Nt. Created 4 years, 1 month 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 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 assertEquals('a/b', settings.getQueryParameters().get('guid')); 869 assertEquals('a/b', settings.getQueryParameters().get('guid'));
870 assertEquals('42', settings.getQueryParameters().get('foo')); 870 assertEquals('42', settings.getQueryParameters().get('foo'));
871 done(); 871 done();
872 }); 872 });
873 window.history.back(); 873 window.history.back();
874 }); 874 });
875 }); 875 });
876 mocha.run(); 876 mocha.run();
877 }); 877 });
878 878
879 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
880 GEN('#if defined(OS_WIN)');
881 GEN('#define MAYBE_MainPage_All DISABLED_All');
882 GEN('#else');
883 GEN('#define MAYBE_MainPage_All All');
884 GEN('#endif');
885
886 /** 879 /**
887 * Test fixture for chrome/browser/resources/settings/settings_main/. 880 * Test fixture for chrome/browser/resources/settings/settings_main/.
888 * @constructor 881 * @constructor
889 * @extends {CrSettingsBrowserTest} 882 * @extends {CrSettingsBrowserTest}
890 */ 883 */
891 function CrSettingsMainPageTest() {} 884 function CrSettingsMainPageTest() {}
892 885
893 CrSettingsMainPageTest.prototype = { 886 CrSettingsMainPageTest.prototype = {
894 __proto__: CrSettingsBrowserTest.prototype, 887 __proto__: CrSettingsBrowserTest.prototype,
895 888
896 /** @override */ 889 /** @override */
897 browsePreload: 'chrome://md-settings/settings_main/settings_main.html', 890 browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
898 891
899 /** @override */ 892 /** @override */
900 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 893 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
894 'search_settings_test.js',
Dan Beam 2016/10/27 01:29:06 can you make a different @constructor for this fil
dpapad 2016/10/27 17:54:52 Done. I was also able to trim the deps needed to l
901 'settings_main_test.js', 895 'settings_main_test.js',
902 ]), 896 ]),
903 }; 897 };
904 898
899 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
900 GEN('#if defined(OS_WIN)');
901 GEN('#define MAYBE_MainPage_All DISABLED_All');
902 GEN('#else');
903 GEN('#define MAYBE_MainPage_All All');
904 GEN('#endif');
905
905 TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() { 906 TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
906 settings_main_page.registerTests(); 907 settings_main_page.registerTests();
907 mocha.run(); 908 mocha.run();
908 }); 909 });
909 910
911 TEST_F('CrSettingsMainPageTest', 'SearchSettings', function() {
912 settings_main_page.registerSearchTests();
913 mocha.run();
914 });
915
910 /** 916 /**
911 * @constructor 917 * @constructor
912 * @extends {CrSettingsBrowserTest} 918 * @extends {CrSettingsBrowserTest}
913 */ 919 */
914 function CrControlledButtonTest() {} 920 function CrControlledButtonTest() {}
915 921
916 CrControlledButtonTest.prototype = { 922 CrControlledButtonTest.prototype = {
917 __proto__: CrSettingsBrowserTest.prototype, 923 __proto__: CrSettingsBrowserTest.prototype,
918 924
919 /** @override */ 925 /** @override */
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 browsePreload: 'chrome://md-settings/settings_action_menu.html', 987 browsePreload: 'chrome://md-settings/settings_action_menu.html',
982 988
983 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 989 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
984 'settings_action_menu_test.js', 990 'settings_action_menu_test.js',
985 ]), 991 ]),
986 }; 992 };
987 993
988 TEST_F('CrSettingsActionMenuTest', 'All', function() { 994 TEST_F('CrSettingsActionMenuTest', 'All', function() {
989 mocha.run(); 995 mocha.run();
990 }); 996 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698