Site Settings Desktop: Support adding exceptions for incognito mode.

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. */
 cr.define('site_list', function() {
   function registerTests() {
     suite('SiteList', function() {
       /**
        * A site list element created before each test.
@@ skipping 229 matching lines @@
             {
               embeddingOrigin: 'http://foo-session.com',
               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',
+              incognito: false,
+              origin: 'http://foo.com',
+              setting: 'block',
+              source: 'preference',
+            },
+            // foo.com is allowed in incognito (overridden).
+            {
+              embeddingOrigin: 'http://foo.com',
+              incognito: true,
+              origin: 'http://foo.com',
+              setting: 'allow',
+              source: 'preference',
+            },
+            // bar.com is an allowed incognito item without an embedder.
+            {
+              embeddingOrigin: '',
+              incognito: true,
+              origin: 'http://bar.com',
+              setting: 'allow',
+              source: 'preference',
+            },
+          ]
+        }
+      };
+
       // Import necessary html before running suite.
       suiteSetup(function() {
         CrSettingsPrefs.setInitialized();
         return PolymerTest.importHtml(
             'chrome://md-settings/site_settings/site_list.html');
       });
 
       suiteTeardown(function() {
         CrSettingsPrefs.resetForTesting();
       });
 
       // Initialize a site-list before each test.
       setup(function() {
         browserProxy = new TestSiteSettingsPrefsBrowserProxy();
         settings.SiteSettingsPrefsBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
         testElement = document.createElement('site-list');
         document.body.appendChild(testElement);
       });
 
       /**
        * Fetch the non-hidden menu items from the list.
        * @param {!HTMLElement} parentElement
+       * @param {number} index The index of the child element (which site) to
+       *     fetch.
        */
-      function getMenuItems(listContainer) {
-        return listContainer.children[0].querySelectorAll(
+      function getMenuItems(listContainer, index) {
+        return listContainer.children[index].querySelectorAll(
             'paper-menu-button paper-item:not([hidden])');
       }
 
       /**
        * Asserts the menu looks as expected.
        * @param {Array<string>} items The items expected to show in the menu.
        * @param {!HTMLElement} parentElement The parent node to start looking
        *     in.
        */
       function assertMenu(items, parentElement) {
-        var menuItems = getMenuItems(parentElement.$.listContainer);
+        var menuItems = getMenuItems(parentElement.$.listContainer, 0);
         assertEquals(items.length, menuItems.length);
         for (var i = 0; i < items.length; i++)
           assertEquals(items[i], menuItems[i].textContent.trim());
       }
 
       /**
        * Configures the test element for a particular category.
        * @param {settings.ContentSettingsTypes} category The category to setup.
        * @param {settings.PermissionValues} subtype Type of list to use.
        * @param {Array<dictionary>} prefs The prefs to use.
@@ skipping 133 matching lines @@
               assertFalse(testElement.$.category.hidden);
               browserProxy.resetResolver('getExceptionList');
               testElement.categoryEnabled = false;
               return browserProxy.whenCalled('getExceptionList');
             }).then(function(contentType) {
               assertFalse(testElement.$.category.hidden);
               assertEquals('Clear on exit - 1', testElement.$.header.innerText);
             });
       });
 
+      test('initial INCOGNITO BLOCK state is correct', function() {
+        setupCategory(settings.ContentSettingsTypes.COOKIES,
+            settings.PermissionValues.BLOCK, prefsIncognito);
+        return browserProxy.whenCalled('getExceptionList').then(
+            function(contentType) {
+              assertEquals(
+                  settings.ContentSettingsTypes.COOKIES, contentType);

[dschuyler, 2016/09/02 22:49:38]

nit: Could this unwrap?

[Finnur, 2016/09/05 11:37:54]

Done.

+
+              assertEquals(1, testElement.sites.length);
+              assertEquals(prefsIncognito.exceptions.cookies[0].origin,
+                  testElement.sites[0].origin);
+
+              assertEquals(settings.PermissionValues.BLOCK,
+                  testElement.categorySubtype);
+              Polymer.dom.flush();  // Populates action menu.
+              // 'Clear on exit' is visible as this is not an incognito item.
+              assertMenu(['Allow', 'Clear on exit', 'Remove'], testElement);
+              assertEquals('Block - 1',
+                  testElement.$.header.innerText.trim());
+
+              // Select 'Remove from menu'.
+              var menuItems = getMenuItems(testElement.$.listContainer, 0);
+              assertTrue(!!menuItems);
+              MockInteractions.tap(menuItems[2]);
+              return browserProxy.whenCalled(
+                  'resetCategoryPermissionForOrigin');
+            }).then(function(arguments) {
+              assertEquals('http://foo.com', arguments[0]);
+              assertEquals('http://foo.com', arguments[1]);
+              assertEquals(settings.ContentSettingsTypes.COOKIES, arguments[2]);
+              assertFalse(arguments[3]);  // Incognito.
+            });
+      });
+
+      test('initial INCOGNITO ALLOW state is correct', function() {
+        setupCategory(settings.ContentSettingsTypes.COOKIES,
+            settings.PermissionValues.ALLOW, prefsIncognito);
+        return browserProxy.whenCalled('getExceptionList').then(
+            function(contentType) {
+              assertEquals(
+                  settings.ContentSettingsTypes.COOKIES, contentType);
+
+              assertEquals(2, testElement.sites.length);
+              assertEquals(prefsIncognito.exceptions.cookies[2].origin,
+                  testElement.sites[0].origin);
+              assertEquals(prefsIncognito.exceptions.cookies[1].origin,
+                  testElement.sites[1].origin);
+
+              assertEquals(settings.PermissionValues.ALLOW,
+                  testElement.categorySubtype);
+              Polymer.dom.flush();  // Populates action menu.
+              // 'Clear on exit' is hidden for incognito items.
+              assertMenu(['Block', 'Remove'], testElement);
+              assertEquals('Allow - 2',
+                  testElement.$.header.innerText.trim());
+
+              // Select 'Remove' from menu on 'foo.com'.
+              var menuItems = getMenuItems(testElement.$.listContainer, 1);
+              assertTrue(!!menuItems);
+              MockInteractions.tap(menuItems[1]);
+              return browserProxy.whenCalled(
+                  'resetCategoryPermissionForOrigin');
+            }).then(function(arguments) {
+              assertEquals('http://foo.com', arguments[0]);
+              assertEquals('http://foo.com', arguments[1]);
+              assertEquals(settings.ContentSettingsTypes.COOKIES, arguments[2]);
+              assertTrue(arguments[3]);  // Incognito.
+            });
+      });
+
       test('list items shown and clickable when data is present', function() {
         setupCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
               // Required for firstItem to be found below.
               Polymer.dom.flush();
@@ skipping 199 matching lines @@
             });
       });
 
       test('Select menu item', function() {
         // Test for error: "Cannot read property 'origin' of undefined".
         setupCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(function(
             contentType) {
           Polymer.dom.flush();
-          var menuItems = getMenuItems(testElement.$.listContainer);
+          var menuItems = getMenuItems(testElement.$.listContainer, 0);
           assertTrue(!!menuItems);
           MockInteractions.tap(menuItems[0]);
           return browserProxy.whenCalled('setCategoryPermissionForOrigin');
         });
       });
     });
   }
   return {
     registerTests: registerTests,
   };
 });