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 0f54682ee4911d007b9f32fef8ac4b0b3247e255..b3888e08bde2f02bddeb3ce3fd1a6c8a973ce2cd 100644 |
| --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| @@ -24,18 +24,10 @@ CrSettingsBrowserTest.prototype = { |
| /** @override */ |
| browsePreload: 'chrome://md-settings/prefs/prefs.html', |
| - /** |
| - * TODO(dbeam): these should not be required monolithically. |
| - * @override |
| - */ |
| + /** @override */ |
| extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| '../fake_chrome_event.js', |
| 'fake_settings_private.js', |
|
dpapad
2016/06/13 18:19:46
Are those two files needed by the majority of CrSe
|
| - 'checkbox_tests.js', |
| - 'dropdown_menu_tests.js', |
| - 'pref_util_tests.js', |
| - 'prefs_test_cases.js', |
| - 'prefs_tests.js', |
| ]), |
| /** @override */ |
| @@ -54,22 +46,67 @@ CrSettingsBrowserTest.prototype = { |
| // Have to include command_line.h manually due to GEN calls below. |
| GEN('#include "base/command_line.h"'); |
| -TEST_F('CrSettingsBrowserTest', 'Checkbox', function() { |
| +function CrSettingsCheckboxTest() {} |
| + |
| +CrSettingsCheckboxTest.prototype = { |
| + __proto__: CrSettingsBrowserTest.prototype, |
| + |
| + /** @override */ |
| + extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'checkbox_tests.js', |
| + ]), |
| +}; |
| + |
| +TEST_F('CrSettingsCheckboxTest', 'All', function() { |
| settings_checkbox.registerTests(); |
| mocha.run(); |
| }); |
| -TEST_F('CrSettingsBrowserTest', 'DropdownMenu', function() { |
| +function CrSettingsDropdownMenuTest() {} |
| + |
| +CrSettingsDropdownMenuTest.prototype = { |
| + __proto__: CrSettingsBrowserTest.prototype, |
| + |
|
dpapad
2016/06/13 18:19:46
Since we split this to a separate C++ test fixture
michaelpg
2016/06/14 00:30:21
can't remember why i didn't just import i18n_setup
|
| + /** @override */ |
| + extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'dropdown_menu_tests.js', |
| + ]), |
| +}; |
| + |
| +TEST_F('CrSettingsDropdownMenuTest', 'All', function() { |
| settings_dropdown_menu.registerTests(); |
| mocha.run(); |
| }); |
| -TEST_F('CrSettingsBrowserTest', 'PrefUtil', function() { |
| +function CrSettingsPrefUtilTest() {} |
| + |
| +CrSettingsPrefUtilTest.prototype = { |
| + __proto__: CrSettingsBrowserTest.prototype, |
| + |
|
dpapad
2016/06/13 18:19:46
Since we split this to a separate C++ test fixture
|
| + /** @override */ |
| + extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'pref_util_tests.js', |
| + ]), |
| +}; |
| + |
| +TEST_F('CrSettingsPrefUtilTest', 'All', function() { |
| settings_prefUtil.registerTests(); |
| mocha.run(); |
| }); |
| -TEST_F('CrSettingsBrowserTest', 'Prefs', function() { |
| +function CrSettingsPrefsTest() {} |
| + |
| +CrSettingsPrefsTest.prototype = { |
| + __proto__: CrSettingsBrowserTest.prototype, |
| + |
| + /** @override */ |
| + extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
| + 'prefs_test_cases.js', |
| + 'prefs_tests.js', |
| + ]), |
| +}; |
| + |
| +TEST_F('CrSettingsPrefsTest', 'All', function() { |
| settings_prefs.registerTests(); |
| mocha.run(); |
| }); |