Commit 83148f8b authored by Ehimare Okoyomon's avatar Ehimare Okoyomon Committed by Commit Bot

Add the correct secondary pattern for edit site exception

Changed edit_exception_dialog.js from site settings to follow the same
exception pattern setting as add_site_dialog.js

Bug: 1057091
Change-Id: I7d1337197df0fc7bc294df077eb433b90820c661
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2082379
Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746367}
parent a858d476
...@@ -63,8 +63,8 @@ Polymer({ ...@@ -63,8 +63,8 @@ Polymer({
this.model.incognito); this.model.incognito);
this.browserProxy_.setCategoryPermissionForPattern( this.browserProxy_.setCategoryPermissionForPattern(
this.origin_, this.origin_, this.model.category, this.model.setting, this.origin_, settings.SITE_EXCEPTION_WILDCARD, this.model.category,
this.model.incognito); this.model.setting, this.model.incognito);
} }
this.$.dialog.close(); this.$.dialog.close();
......
...@@ -1044,7 +1044,7 @@ suite('EditExceptionDialog', function() { ...@@ -1044,7 +1044,7 @@ suite('EditExceptionDialog', function() {
setup(function() { setup(function() {
cookieException = { cookieException = {
category: settings.ContentSettingsTypes.COOKIES, category: settings.ContentSettingsTypes.COOKIES,
embeddingOrigin: 'http://foo.com', embeddingOrigin: settings.SITE_EXCEPTION_WILDCARD,
incognito: false, incognito: false,
setting: settings.ContentSetting.BLOCK, setting: settings.ContentSetting.BLOCK,
enforcement: '', enforcement: '',
...@@ -1116,7 +1116,7 @@ suite('EditExceptionDialog', function() { ...@@ -1116,7 +1116,7 @@ suite('EditExceptionDialog', function() {
}) })
.then(function(args) { .then(function(args) {
assertEquals(newValue, args[0]); assertEquals(newValue, args[0]);
assertEquals(newValue, args[1]); assertEquals(settings.SITE_EXCEPTION_WILDCARD, args[1]);
assertEquals(settings.ContentSettingsTypes.COOKIES, args[2]); assertEquals(settings.ContentSettingsTypes.COOKIES, args[2]);
assertEquals(cookieException.setting, args[3]); assertEquals(cookieException.setting, args[3]);
assertEquals(cookieException.incognito, args[4]); assertEquals(cookieException.incognito, args[4]);
......
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