Commit 17e5f994 authored by dpapad's avatar dpapad Committed by Commit Bot

MD Extensions: Fix assertion erroneously failing on blacklisted extensions.

This is causing the Extensions page to not display all extensions in such cases.

Bug: 823164
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I39ba59b9e1ccd71cca3b5c68fc9d3715949342ec
Reviewed-on: https://chromium-review.googlesource.com/981522
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546203}
parent ca263da9
...@@ -24,6 +24,7 @@ cr.define('extensions', function() { ...@@ -24,6 +24,7 @@ cr.define('extensions', function() {
case chrome.developerPrivate.ExtensionState.ENABLED: case chrome.developerPrivate.ExtensionState.ENABLED:
case chrome.developerPrivate.ExtensionState.TERMINATED: case chrome.developerPrivate.ExtensionState.TERMINATED:
return true; return true;
case chrome.developerPrivate.ExtensionState.BLACKLISTED:
case chrome.developerPrivate.ExtensionState.DISABLED: case chrome.developerPrivate.ExtensionState.DISABLED:
return false; return false;
} }
......
...@@ -105,6 +105,8 @@ cr.define('extension_item_tests', function() { ...@@ -105,6 +105,8 @@ cr.define('extension_item_tests', function() {
expectTrue(item.$['enable-toggle'].checked); expectTrue(item.$['enable-toggle'].checked);
item.set('data.state', 'DISABLED'); item.set('data.state', 'DISABLED');
expectFalse(item.$['enable-toggle'].checked); expectFalse(item.$['enable-toggle'].checked);
item.set('data.state', 'BLACKLISTED');
expectFalse(item.$['enable-toggle'].checked);
}); });
test(assert(TestNames.ElementVisibilityDeveloperState), function() { test(assert(TestNames.ElementVisibilityDeveloperState), function() {
...@@ -301,9 +303,17 @@ cr.define('extension_item_tests', function() { ...@@ -301,9 +303,17 @@ cr.define('extension_item_tests', function() {
test(assert(TestNames.EnableToggle), function() { test(assert(TestNames.EnableToggle), function() {
expectFalse(item.$['enable-toggle'].disabled); expectFalse(item.$['enable-toggle'].disabled);
// Test case where user does not have permission.
item.set('data.userMayModify', false); item.set('data.userMayModify', false);
Polymer.dom.flush(); Polymer.dom.flush();
expectTrue(item.$['enable-toggle'].disabled); expectTrue(item.$['enable-toggle'].disabled);
// Test case of a blacklisted extension.
item.set('data.userMayModify', true);
item.set('data.state', 'BLACKLISTED');
Polymer.dom.flush();
expectTrue(item.$['enable-toggle'].disabled);
}); });
test(assert(TestNames.RemoveButton), function() { test(assert(TestNames.RemoveButton), function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment