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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/webui/settings/site_settings_category_tests.js

Issue 2509163004: [MD settings] content category policy (Closed)
Patch Set: main toggle and sub-setting toogle show controlled by icon; review changes 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc ('K') | « chrome/browser/ui/webui/site_settings_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/settings/site_settings_category_tests.js
diff --git a/chrome/test/data/webui/settings/site_settings_category_tests.js b/chrome/test/data/webui/settings/site_settings_category_tests.js
index 58eb160c9ee489bf2312aa3bf38a98347054812e..1f27495721f7f0cbbd613c56985d344ab7383b04 100644
--- a/chrome/test/data/webui/settings/site_settings_category_tests.js
+++ b/chrome/test/data/webui/settings/site_settings_category_tests.js
@@ -24,7 +24,9 @@ cr.define('site_settings_category', function() {
*/
var prefsLocationDisabled = {
defaults: {
- geolocation: 'block',
+ geolocation: {
+ setting: 'block',
+ },
},
exceptions: {
geolocation: [],
@@ -37,7 +39,9 @@ cr.define('site_settings_category', function() {
*/
var prefsLocationEnabled = {
defaults: {
- geolocation: 'allow',
+ geolocation: {
+ setting: 'allow',
+ },
},
exceptions: {
geolocation: [],
@@ -49,7 +53,9 @@ cr.define('site_settings_category', function() {
*/
var prefsFlashDetect = {
defaults: {
- plugins: 'detect_important_content',
+ plugins: {
+ setting: 'detect_important_content',
+ },
},
exceptions: {
plugins: [],
@@ -62,7 +68,9 @@ cr.define('site_settings_category', function() {
*/
var prefsCookesSessionOnly = {
defaults: {
- cookies: 'session_only',
+ cookies: {
+ setting: 'session_only',
+ },
},
exceptions: {
cookies: [],
@@ -94,6 +102,7 @@ cr.define('site_settings_category', function() {
});
function testCategoryEnabled(testElement, enabled) {
+ browserProxy.reset();
browserProxy.setPrefs(
enabled ? prefsLocationEnabled : prefsLocationDisabled);
@@ -102,17 +111,18 @@ cr.define('site_settings_category', function() {
function(contentType) {
assertEquals(
settings.ContentSettingsTypes.GEOLOCATION, contentType);
- assertEquals(enabled, testElement.categoryEnabled);
- MockInteractions.tap(testElement.$.toggle);
+ assertEquals(enabled, testElement.$.toggle.pref.value);
+ browserProxy.resetResolver('setDefaultValueForContentType');
+ MockInteractions.tap(testElement.$.toggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
assertEquals(
- settings.ContentSettingsTypes.GEOLOCATION, arguments[0]);
+ settings.ContentSettingsTypes.GEOLOCATION, args[0]);
assertEquals(
enabled ? settings.PermissionValues.BLOCK :
settings.PermissionValues.ASK,
- arguments[1]);
- assertNotEquals(enabled, testElement.categoryEnabled);
+ args[1]);
+ assertNotEquals(enabled, testElement.$.toggle.pref.value);
});
}
@@ -167,114 +177,116 @@ cr.define('site_settings_category', function() {
}
});
- function testTristateCategory(prefs, category, thirdState, checkbox) {
+ function testTristateCategory(prefs, category, thirdState, toggleId) {
browserProxy.setPrefs(prefs);
testElement.category = category;
- var askCheckbox = null;
+ var askToggle = null;
return browserProxy.whenCalled('getDefaultValueForContentType').then(
function(contentType) {
Polymer.dom.flush();
- askCheckbox = testElement.$$(checkbox);
- assertTrue(!!askCheckbox);
+ askToggle = testElement.$$(toggleId);
+ assertTrue(!!askToggle);
assertEquals(category, contentType);
- assertTrue(testElement.categoryEnabled);
- assertFalse(askCheckbox.disabled);
- assertTrue(askCheckbox.checked);
+ assertTrue(testElement.$.toggle.pref.value);
+ assertTrue(testElement.fakePref_.value);
+ assertFalse(askToggle.disabled);
+ assertTrue(askToggle.checked);
- MockInteractions.tap(testElement.$.toggle);
+ browserProxy.resetResolver('setDefaultValueForContentType');
+ MockInteractions.tap(testElement.$.toggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
Dan Beam 2016/11/29 05:17:14 omg this is a horrible idea
dschuyler 2016/11/29 22:28:12 They didn't know. Detecting this could be a handy
+ }).then(function(args) {
// Check THIRD_STATE => BLOCK transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
- assertEquals(settings.PermissionValues.BLOCK, arguments[1]);
- assertFalse(testElement.categoryEnabled);
- assertTrue(askCheckbox.disabled);
- assertTrue(askCheckbox.checked);
+ assertEquals(category, args[0]);
+ assertEquals(settings.PermissionValues.BLOCK, args[1]);
+ assertFalse(testElement.$.toggle.pref.value);
+ assertTrue(askToggle.disabled);
+ assertTrue(askToggle.checked);
browserProxy.resetResolver('setDefaultValueForContentType');
- MockInteractions.tap(testElement.$.toggle);
+ MockInteractions.tap(testElement.$.toggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
// Check BLOCK => THIRD_STATE transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
- assertEquals(thirdState, arguments[1]);
- assertTrue(testElement.categoryEnabled);
- assertFalse(askCheckbox.disabled);
- assertTrue(askCheckbox.checked);
+ assertEquals(category, args[0]);
+ assertEquals(thirdState, args[1]);
+ assertTrue(testElement.$.toggle.pref.value);
+ assertFalse(askToggle.disabled);
+ assertTrue(askToggle.checked);
browserProxy.resetResolver('setDefaultValueForContentType');
- MockInteractions.tap(askCheckbox);
+ MockInteractions.tap(askToggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
// Check THIRD_STATE => ALLOW transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
+ assertEquals(category, args[0]);
assertEquals(
- settings.PermissionValues.ALLOW, arguments[1]);
- assertTrue(testElement.categoryEnabled);
- assertFalse(askCheckbox.disabled);
- assertFalse(askCheckbox.checked);
+ settings.PermissionValues.ALLOW, args[1]);
+ assertTrue(testElement.$.toggle.pref.value);
+ assertFalse(askToggle.disabled);
+ assertFalse(askToggle.checked);
browserProxy.resetResolver('setDefaultValueForContentType');
- MockInteractions.tap(testElement.$.toggle);
+ MockInteractions.tap(testElement.$.toggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
// Check ALLOW => BLOCK transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
- assertEquals(settings.PermissionValues.BLOCK, arguments[1]);
- assertFalse(testElement.categoryEnabled);
- assertTrue(askCheckbox.disabled);
- assertFalse(askCheckbox.checked);
+ assertEquals(category, args[0]);
+ assertEquals(settings.PermissionValues.BLOCK, args[1]);
+ assertFalse(testElement.$.toggle.pref.value);
+ assertTrue(askToggle.disabled);
+ assertFalse(askToggle.checked);
browserProxy.resetResolver('setDefaultValueForContentType');
- MockInteractions.tap(testElement.$.toggle);
+ MockInteractions.tap(testElement.$.toggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
// Check BLOCK => ALLOW transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
- assertEquals(settings.PermissionValues.ALLOW, arguments[1]);
- assertTrue(testElement.categoryEnabled);
- assertFalse(askCheckbox.disabled);
- assertFalse(askCheckbox.checked);
+ assertEquals(category, args[0]);
+ assertEquals(settings.PermissionValues.ALLOW, args[1]);
+ assertTrue(testElement.$.toggle.pref.value);
+ assertFalse(askToggle.disabled);
+ assertFalse(askToggle.checked);
browserProxy.resetResolver('setDefaultValueForContentType');
- MockInteractions.tap(askCheckbox);
+ MockInteractions.tap(askToggle.$.control);
return browserProxy.whenCalled('setDefaultValueForContentType');
- }).then(function(arguments) {
+ }).then(function(args) {
// Check ALLOW => THIRD_STATE transition succeeded.
Polymer.dom.flush();
- assertEquals(category, arguments[0]);
- assertEquals(thirdState, arguments[1]);
- assertTrue(testElement.categoryEnabled);
- assertFalse(askCheckbox.disabled);
- assertTrue(askCheckbox.checked);
+ assertEquals(category, args[0]);
+ assertEquals(thirdState, args[1]);
+ assertTrue(testElement.$.toggle.pref.value);
+ assertFalse(askToggle.disabled);
+ assertTrue(askToggle.checked);
});
}
test('test special tri-state Flash category', function() {
return testTristateCategory(
prefsFlashDetect, settings.ContentSettingsTypes.PLUGINS,
- settings.PermissionValues.IMPORTANT_CONTENT, '#flashAskCheckbox');
+ settings.PermissionValues.IMPORTANT_CONTENT, '#flashAskToggle');
});
test('test special tri-state Cookies category', function() {
return testTristateCategory(
prefsCookesSessionOnly, settings.ContentSettingsTypes.COOKIES,
- settings.PermissionValues.SESSION_ONLY, '#sessionOnlyCheckbox');
+ settings.PermissionValues.SESSION_ONLY, '#sessionOnlyToggle');
});
});
}
« chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc ('K') | « chrome/browser/ui/webui/site_settings_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698