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 376938e9c2bbe8b5f2d31ed5ae9ce9c0b7437368..52f42349eb268a52e85e39aa0d7e551ca4af65fc 100644 |
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
@@ -776,13 +776,12 @@ TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPage', function() { |
}); |
/** |
- * Test fixture for chrome/browser/resources/settings/site_settings/. |
* @constructor |
* @extends {CrSettingsBrowserTest} |
*/ |
-function CrSettingsSiteSettingsTest() {} |
+function CrSettingsSiteDataDetailsTest() {} |
-CrSettingsSiteSettingsTest.prototype = { |
+CrSettingsSiteDataDetailsTest.prototype = { |
__proto__: CrSettingsBrowserTest.prototype, |
/** @override */ |
@@ -795,29 +794,221 @@ CrSettingsSiteSettingsTest.prototype = { |
/** @override */ |
extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
- // TODO(dbeam): split these up. |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
+ 'site_data_details_subpage_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsSiteDataDetailsTest', 'SiteSettings', function() { |
+ mocha.run(); |
+}); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsCategoryDefaultSettingTest() {} |
+ |
+CrSettingsCategoryDefaultSettingTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'category_default_setting_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsCategoryDefaultSettingTest', 'CategorySetting', function() { |
+ mocha.run(); |
+}); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsCategorySettingExceptionsTest() {} |
+ |
+CrSettingsCategorySettingExceptionsTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'category_setting_exceptions_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F( |
+ 'CrSettingsCategorySettingExceptionsTest', 'CategorySettingExceptions', |
+ function() { |
+ mocha.run(); |
+ }); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsSiteDetailsTest() {} |
+ |
+CrSettingsSiteDetailsTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'site_details_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsSiteDetailsTest', 'SiteDetails', function() { |
+ mocha.run(); |
+}); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsSiteDetailsPermissionTest() {} |
+ |
+CrSettingsSiteDetailsPermissionTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'site_details_permission_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F( |
+ 'CrSettingsSiteDetailsPermissionTest', 'SiteDetailsPermission', function() { |
+ mocha.run(); |
+ }); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsSiteListTest() {} |
+ |
+CrSettingsSiteListTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ commandLineSwitches: [{ |
+ switchName: 'enable-site-settings', |
+ }], |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'site_list_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsSiteListTest', 'SiteList', function() { |
+ mocha.run(); |
+}); |
+ |
+TEST_F('CrSettingsSiteListTest', 'EditExceptionDialog', function() { |
+ mocha.run(); |
+}); |
+ |
+TEST_F('CrSettingsSiteListTest', 'AddExceptionDialog', function() { |
+ mocha.run(); |
+}); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsZoomLevelsTest() {} |
+ |
+CrSettingsZoomLevelsTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
'test_browser_proxy.js', |
'test_site_settings_prefs_browser_proxy.js', |
'zoom_levels_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsZoomLevelsTest', 'UsbDevices', function() { |
+ mocha.run(); |
+}); |
+ |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsUsbDevicesTest() {} |
+ |
+CrSettingsUsbDevicesTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
'usb_devices_tests.js', |
- 'site_data_details_subpage_tests.js', |
]), |
}; |
-TEST_F('CrSettingsSiteSettingsTest', 'SiteSettings', function() { |
- category_default_setting.registerTests(); |
- category_setting_exceptions.registerTests(); |
- site_details.registerTests(); |
- site_details_permission.registerTests(); |
- site_list.registerTests(); |
- zoom_levels.registerTests(); |
- usb_devices.registerTests(); |
+TEST_F('CrSettingsUsbDevicesTest', 'UsbDevices', function() { |
+ mocha.run(); |
+}); |
+/** |
+ * @constructor |
+ * @extends {CrSettingsBrowserTest} |
+ */ |
+function CrSettingsProtocolHandlersTest() {} |
+ |
+CrSettingsProtocolHandlersTest.prototype = { |
+ __proto__: CrSettingsBrowserTest.prototype, |
+ |
+ /** @override */ |
+ browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', |
+ |
+ /** @override */ |
+ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ |
+ 'test_browser_proxy.js', |
+ 'test_site_settings_prefs_browser_proxy.js', |
+ 'protocol_handlers_tests.js', |
+ ]), |
+}; |
+ |
+TEST_F('CrSettingsProtocolHandlersTest', 'ProtocolHandlers', function() { |
mocha.run(); |
}); |