Chromium Code Reviews| Index: chrome/test/data/webui/settings/cr_settings_browsertest.js |
| diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| index 6790547a46ce942fbbbcf6073391fe7cf4773692..2638bd55c02d55e07bb97dda360d09ffe9422836 100644 |
| --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| @@ -24,9 +24,10 @@ CrSettingsBrowserTest.prototype = { |
| /** @override */ |
| browsePreload: 'chrome://md-settings/prefs/prefs.html', |
| - commandLineSwitches: [{switchName: 'enable-md-settings'}], |
| - |
| - /** @override */ |
| + /** |
| + * TODO(dbeam): these should not be required monolithically. |
| + * @override |
| + */ |
| extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| '../fake_chrome_event.js', |
| 'fake_settings_private.js', |
| @@ -53,9 +54,8 @@ GEN('#else'); |
| GEN('#define MAYBE_CrSettingsTest CrSettingsTest'); |
| GEN('#endif'); |
| -// Runs all tests. |
| +// TODO(dbeam): these should be split into multiple TEST_F()s. |
|
Dan Beam
2016/02/17 20:01:36
to answer your original question: because timeouts
|
| TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() { |
| - // Register mocha tests for each element. |
| settings_checkbox.registerTests(); |
| settings_dropdown_menu.registerTests(); |
| settings_prefUtil.registerTests(); |
| @@ -69,9 +69,32 @@ TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() { |
| mocha.run(); |
| }); |
| - |
| TEST_F('CrSettingsBrowserTest', 'ResetPage', function() { |
| settings_reset_page.registerDialogTests(); |
| settings_reset_page.registerBannerTests(); |
| mocha.run(); |
| }); |
| + |
| +/** |
| + * @constructor |
| + * @extends {CrSettingsBrowserTest} |
| + */ |
| +function CrSettingsRtlTest() {} |
| + |
| +CrSettingsRtlTest.prototype = { |
| + __proto__: CrSettingsBrowserTest.prototype, |
| + |
| + /** @override */ |
| + browsePreload: 'chrome://md-settings/settings_ui/settings_ui.html', |
| + |
| + /** @override */ |
| + extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'rtl_tests.js', |
| + ]), |
| +}; |
| + |
| +TEST_F('CrSettingsRtlTest', 'drawerPanelFlips', function() { |
|
michaelpg
2016/02/17 21:14:04
nit: DrawerPanelFlips?
Dan Beam
2016/02/18 00:16:15
Done. (this varies depending on which tests your l
|
| + settingsHidePagesByDefaultForTest = true; |
| + settings_rtl_tests.registerDrawerPanelTests(); |
| + mocha.run(); |
| +}); |