[MD settings] content exceptions with embeddingOrigin as read-only

chrome/test/data/webui/settings/site_list_tests.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /** @fileoverview Suite of tests for site-list. */
 
 /**
  * An example pref with 2 blocked location items and 2 allowed. This pref
  * is also used for the All Sites category and therefore needs values for
  * all types, even though some might be blank.
@@ skipping 109 matching lines @@
         embeddingOrigin: 'https://[*.]foo.com',
         origin: 'https://[*.]foo.com',
         setting: 'block',
         source: 'preference',
       },
     ]
   }
 };
 
 /**
+ * An example pref with with and without embeddingOrigin.

[dpapad, 2017/05/10 21:44:57]

s/with with/with

[dschuyler, 2017/05/10 22:05:37]

Done.

+ * @type {SiteSettingsPref}
+ */
+var prefsMixedEmbeddingOrigin = {
+  exceptions: {
+    geolocation: [
+      {
+        origin: 'https://foo.com',
+        embeddingOrigin: 'https://example.com',
+        setting: 'allow',
+        source: 'preference',
+      },
+      {
+        origin: 'https://bar.com',
+        embeddingOrigin: '',
+        setting: 'allow',
+        source: 'preference',
+      },
+    ],
+  }
+};
+
+/**
  * An example pref with mixed origin and pattern.
  * @type {SiteSettingsPref}
  */
 var prefsMixedOriginAndPattern = {
   exceptions: {
     auto_downloads: [],
     background_sync: [],
     camera: [],
     cookies: [],
     geolocation: [
       {
         origin: 'https://foo.com',
-        embeddingOrigin: '*',
+        embeddingOrigin: 'https://example.com',
         setting: 'allow',
         source: 'preference',
       },
     ],
     images: [],
     javascript: [
       {
         origin: 'https://[*.]foo.com',
-        embeddingOrigin: '*',
+        embeddingOrigin: '',
         setting: 'allow',
         source: 'preference',
       },
     ],
     mic: [],
     notifications: [],
     plugins: [],
     midiDevices: [],
     protectedContent: [],
     popups: [],
     subresource_filter: [],
     unsandboxed_plugins: [],
   }
 };
 
 /**
  * An example pref with multiple categories and multiple allow/block
  * state.
  * @type {SiteSettingsPref}
  */
 var prefsVarious = {
   exceptions: {
     auto_downloads: [],
     background_sync: [],
     camera: [],
     cookies: [],
     geolocation: [
       {
-        embeddingOrigin: 'https://foo.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://foo.com',
         setting: 'allow',
         source: 'preference',
       },
       {
-        embeddingOrigin: 'https://bar.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://bar.com',
         setting: 'block',
         source: 'preference',
       },
     ],
     images: [],
     javascript: [],
     mic: [],
     midiDevices: [],
     notifications: [
       {
-        embeddingOrigin: 'https://google.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://google.com',
         setting: 'block',
         source: 'preference',
       },
       {
-        embeddingOrigin: 'https://bar.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://bar.com',
         setting: 'block',
         source: 'preference',
       },
       {
-        embeddingOrigin: 'https://foo.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://foo.com',
         setting: 'block',
         source: 'preference',
       },
     ],
     plugins: [],
     protectedContent: [],
     popups: [],
     subresource_filter: [],
     unsandboxed_plugins: [],
   }
 };
 
 /**
  * An example pref with 1 allowed location item.
  * @type {SiteSettingsPref}
  */
 var prefsOneEnabled = {
   exceptions: {
     geolocation: [
       {
-        embeddingOrigin: 'https://foo-allow.com:443',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://foo-allow.com:443',
         setting: 'allow',
         source: 'preference',
       },
     ]
   }
 };
 
 /**
  * An example pref with 1 blocked location item.
  * @type {SiteSettingsPref}
  */
 var prefsOneDisabled = {
   exceptions: {
     geolocation: [
       {
-        embeddingOrigin: 'https://foo-block.com:443',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'https://foo-block.com:443',
         setting: 'block',
         source: 'preference',
       },
     ]
   }
 };
 
 /**
  * An example Cookies pref with 1 in each of the three categories.
  * @type {SiteSettingsPref}
  */
 var prefsSessionOnly = {
   exceptions: {
     cookies: [
       {
-        embeddingOrigin: 'http://foo-block.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'http://foo-block.com',
         setting: 'block',
         source: 'preference',
       },
       {
-        embeddingOrigin: 'http://foo-allow.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'http://foo-allow.com',
         setting: 'allow',
         source: 'preference',
       },
       {
-        embeddingOrigin: 'http://foo-session.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'http://foo-session.com',
         setting: 'session_only',
         source: 'preference',
       },
     ]
   }
 };
 
 /**
  * An example Cookies pref with mixed incognito and regular settings.
  * @type {SiteSettingsPref}
  */
 var prefsIncognito = {
   exceptions: {
     cookies: [
       // foo.com is blocked for regular sessions.
       {
-        embeddingOrigin: 'http://foo.com',
+        embeddingOrigin: '',
         incognito: false,
         origin: 'http://foo.com',
         setting: 'block',
         source: 'preference',
       },
-      // bar.com is an allowed incognito item without an embedder.
+      // bar.com is an allowed incognito item.
       {
         embeddingOrigin: '',
         incognito: true,
         origin: 'http://bar.com',
         setting: 'allow',
         source: 'preference',
       },
       // foo.com is allowed in incognito (overridden).
       {
-        embeddingOrigin: 'http://foo.com',
+        embeddingOrigin: '',
         incognito: true,
         origin: 'http://foo.com',
         setting: 'allow',
         source: 'preference',
       },
 
     ]
   }
 };
 
@@ skipping 343 matching lines @@
           assertMenu(['Allow', 'Clear on exit', 'Edit', 'Remove'], testElement);
 
           // Select 'Remove' from menu.
           var remove = testElement.$.reset;
           assertTrue(!!remove);
           MockInteractions.tap(remove);
           return browserProxy.whenCalled('resetCategoryPermissionForOrigin');
         })
         .then(function(args) {
           assertEquals('http://foo.com', args[0]);
-          assertEquals('http://foo.com', args[1]);
+          assertEquals('', args[1]);
           assertEquals(contentType, args[2]);
           assertFalse(args[3]);  // Incognito.
         });
   });
 
   test('initial INCOGNITO ALLOW state is correct', function() {
     var contentType = settings.ContentSettingsTypes.COOKIES;
     var categorySubtype = settings.PermissionValues.ALLOW;
     setUpCategory(contentType, categorySubtype, prefsIncognito);
     return browserProxy.whenCalled('getExceptionList')
@@ skipping 17 matching lines @@
 
           // Select 'Remove' from menu on 'foo.com'.
           openActionMenu(1);
           var remove = testElement.$.reset;
           assertTrue(!!remove);
           MockInteractions.tap(remove);
           return browserProxy.whenCalled('resetCategoryPermissionForOrigin');
         })
         .then(function(args) {
           assertEquals('http://foo.com', args[0]);
-          assertEquals('http://foo.com', args[1]);
+          assertEquals('', args[1]);
           assertEquals(contentType, args[2]);
           assertTrue(args[3]);  // Incognito.
         });
   });
 
   test('reset button works for read-only content types', function() {
     testElement.readOnlyList = true;
     Polymer.dom.flush();
 
     var contentType = settings.ContentSettingsTypes.GEOLOCATION;
@@ skipping 21 matching lines @@
           // Assert reset button is visible.
           var resetButton = item.querySelector('#resetSite');
           assertTrue(!!resetButton);
           assertFalse(resetButton.hidden);
 
           MockInteractions.tap(resetButton);
           return browserProxy.whenCalled('resetCategoryPermissionForOrigin');
         })
         .then(function(args) {
           assertEquals('https://foo-allow.com:443', args[0]);
-          assertEquals('https://foo-allow.com:443', args[1]);
+          assertEquals('', args[1]);
           assertEquals(contentType, args[2]);
         });
   });
 
   test('edit action menu opens edit exception dialog', function() {
     setUpCategory(
         settings.ContentSettingsTypes.COOKIES,
         settings.PermissionValues.SESSION_ONLY, prefsSessionOnly);
 
     return browserProxy.whenCalled('getExceptionList').then(function() {
@@ skipping 228 matching lines @@
             MockInteractions.tap(clickable);
             if (testElement.sites.length == 1) {
               assertEquals(
                   prefsMixedOriginAndPattern.exceptions.geolocation[0].origin,
                   testElement.sites[0].displayName);
             }
           });
         });
   });
 
+  test('Mixed embeddingOrigin', function() {
+    setUpCategory(
+        settings.ContentSettingsTypes.GEOLOCATION,

[dpapad, 2017/05/10 21:44:57]

Should we use a different category for this test, since GEOLOCATION is read-only
anyway?

[dschuyler, 2017/05/10 22:05:37]

Done.

+        settings.PermissionValues.ALLOW, prefsMixedEmbeddingOrigin);
+    return browserProxy.whenCalled('getExceptionList')
+        .then(function(contentType) {
+          // Required for firstItem to be found below.
+          Polymer.dom.flush();
+          // Validate that embeddingOrigin sites cannot be edited.
+          var firstItem = testElement.$.listContainer.children[0];
+          assertTrue(firstItem.querySelector('#actionMenuButton').hidden);
+          assertFalse(firstItem.querySelector('#resetSite').hidden);
+          // Validate that non-embeddingOrigin sites can be edited.
+          var secondItem = testElement.$.listContainer.children[1];
+          assertFalse(secondItem.querySelector('#actionMenuButton').hidden);
+          assertTrue(secondItem.querySelector('#resetSite').hidden);
+        });
+  });
+
   test('Mixed schemes (present and absent)', function() {
     // Prefs: One item with scheme and one without.
     setUpCategory(
         settings.ContentSettingsTypes.GEOLOCATION,
         settings.PermissionValues.ALLOW, prefsMixedSchemes);
     return browserProxy.whenCalled('getExceptionList')
         .then(function(contentType) {
           // No further checks needed. If this fails, it will hang the test.
         });
   });
@@ skipping 180 matching lines @@
     input.value = expectedPattern;
     input.fire('input');
 
     return browserProxy.whenCalled('isPatternValid').then(function(pattern) {
       assertEquals(expectedPattern, pattern);
       assertTrue(actionButton.disabled);
       assertTrue(input.invalid);
     });
   });
 });