[MD settings] unit test for incognito activation

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() {
   /**
    * 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 41 matching lines @@
       midiDevices: [],
       notifications: [],
       plugins: [],
       protectedContent: [],
       popups: [],
       unsandboxed_plugins: [],
     }
   };
 
   /**
+   * An example of prefs controlleBy policy.
+   * @type {SiteSettingsPref}
+   */
+  var prefsControlled = {
+    exceptions: {
+      plugins: [
+        {
+          category: 'plugins',
+          embeddingOrigin: 'http://foo-block.com',
+          origin: 'http://foo-block.com',
+          setting: 'block',
+          source: 'policy',
+        },
+      ]
+    }
+  };
+
+  /**
    * An example pref with mixed schemes (present and absent).
    * @type {SiteSettingsPref}
    */
   var prefsMixedSchemes = {
     exceptions: {
       geolocation: [
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo-allow.com',
           origin: 'https://foo-allow.com',
@@ skipping 92 matching lines @@
   var prefsVarious = {
     exceptions: {
       auto_downloads: [],
       background_sync: [],
       camera: [],
       cookies: [],
       geolocation: [
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo.com',
+          incognito: false,
           origin: 'https://foo.com',
           setting: 'allow',
           source: 'preference',
         },
         {
           category: 'geolocation',
           embeddingOrigin: 'https://bar.com',
+          incognito: false,
           origin: 'https://bar.com',
           setting: 'block',
           source: 'preference',
         },
       ],
       images: [],
       javascript: [],
       mic: [],
       midiDevices: [],
       notifications: [
         {
           category: 'notifications',
           embeddingOrigin: 'https://google.com',
+          incognito: false,
           origin: 'https://google.com',
           setting: 'block',
           source: 'preference',
         },
         {
           category: 'notifications',
           embeddingOrigin: 'https://bar.com',
+          incognito: false,
           origin: 'https://bar.com',
           setting: 'block',
           source: 'preference',
         },
         {
           category: 'notifications',
           embeddingOrigin: 'https://foo.com',
+          incognito: false,
           origin: 'https://foo.com',
           setting: 'block',
           source: 'preference',
         },
       ],
       plugins: [],
       protectedContent: [],
       popups: [],
       unsandboxed_plugins: [],
     }
   };
 
   /**
    * An example pref with 1 allowed location item.
    * @type {SiteSettingsPref}
    */
   var prefsOneEnabled = {
     exceptions: {
       geolocation: [
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo-allow.com:443',
+          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: [
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo-block.com:443',
+          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: [
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-block.com',
+          incognito: false,
           origin: 'http://foo-block.com',
           setting: 'block',
           source: 'preference',
         },
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-allow.com',
+          incognito: false,
           origin: 'http://foo-allow.com',
           setting: 'allow',
           source: 'preference',
         },
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-session.com',
+          incognito: false,
           origin: 'http://foo-session.com',
           setting: 'session_only',
           source: 'preference',
         },
       ]
     }
   };
 
   /**
    * An example Cookies pref with mixed incognito and regular settings.
@@ skipping 37 matching lines @@
   /**
    * An example Javascript pref with a chrome-extension:// scheme.
    * @type {SiteSettingsPref}
    */
   var prefsChromeExtension = {
     exceptions: {
       javascript: [
         {
           category: 'javascript',
           embeddingOrigin: '',
+          incognito: false,
           origin: 'chrome-extension://cfhgfbfpcbnnbibfphagcjmgjfjmojfa/',
           setting: 'block',
           source: 'preference',
         },
       ]
     }
   };
 
   function registerTests() {
     suite('SiteList', function() {
@@ skipping 60 matching lines @@
       function assertMenu(items) {
         var menu = testElement.$$('dialog[is=cr-action-menu]');
         assertTrue(!!menu);
         var menuItems = menu.querySelectorAll('button:not([hidden])');
         assertEquals(items.length, menuItems.length);
         for (var i = 0; i < items.length; i++)
           assertEquals(items[i], menuItems[i].textContent.trim());
       }
 
       /**
+       * @param {HTMLElement} listContainer Node with the exceptions listed.
+       * @return {boolean} Whether the entry is incognito only.
+       */
+      function hasAnIncognito(listContainer) {
+        var descriptions = listContainer.querySelectorAll('#siteDescription');
+        for (var i = 0; i < descriptions.length; ++i) {
+          if (descriptions[i].textContent == 'Current incognito session')
+            return true;
+        }
+        return false;
+      };

[Dan Beam, 2017/03/30 04:50:43]

no ; after function declarations

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/...

(which differs from function expressions:
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/f...)

[dschuyler, 2017/03/30 21:06:16]

See https://codereview.chromium.org/2787923002/

+

[Dan Beam, 2017/03/30 04:50:43]

one less \n

[dschuyler, 2017/03/30 21:06:16]

See https://codereview.chromium.org/2787923002/

+
+      /**
        * Configures the test element for a particular category.
        * @param {settings.ContentSettingsTypes} category The category to set up.
        * @param {settings.PermissionValues} subtype Type of list to use.
        * @param {Array<dictionary>} prefs The prefs to use.
        */
       function setUpCategory(category, subtype, prefs) {
         browserProxy.setPrefs(prefs);
         if (category == settings.ALL_SITES) {
           testElement.categorySubtype = settings.INVALID_CATEGORY_SUBTYPE;
           testElement.allSites = true;
@@ skipping 160 matching lines @@
                   testElement.sites[0].origin);
 
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Allow', 'Block', 'Edit', 'Remove'], testElement);
 
               assertFalse(testElement.$.category.hidden);
             });
       });
 
+      test('update lists for incognito', function() {
+        var contentType = settings.ContentSettingsTypes.PLUGINS;
+        var categorySubtype = settings.PermissionValues.BLOCK;
+        setUpCategory(contentType, categorySubtype, prefsControlled);
+        var list = testElement.$.listContainer;
+        return browserProxy.whenCalled('getExceptionList')
+            .then(function(actualContentType) {
+              Polymer.dom.flush();
+              assertEquals(1, list.querySelectorAll('.list-item').length);
+              assertFalse(hasAnIncognito(list));
+              browserProxy.resetResolver('getExceptionList');
+              browserProxy.setIncognito(true);
+              return browserProxy.whenCalled('getExceptionList');
+            })
+            .then(function() {
+              Polymer.dom.flush();
+              assertEquals(2, list.querySelectorAll('.list-item').length);
+              assertTrue(hasAnIncognito(list));
+              browserProxy.resetResolver('getExceptionList');
+              browserProxy.setIncognito(false);
+              return browserProxy.whenCalled('getExceptionList');
+            })
+            .then(function() {
+              Polymer.dom.flush();
+              assertEquals(1, list.querySelectorAll('.list-item').length);
+              assertFalse(hasAnIncognito(list));
+              browserProxy.resetResolver('getExceptionList');
+              browserProxy.setIncognito(true);
+              return browserProxy.whenCalled('getExceptionList');
+            })
+            .then(function() {
+              Polymer.dom.flush();
+              assertEquals(2, list.querySelectorAll('.list-item').length);
+              assertTrue(hasAnIncognito(list));
+            });
+      });
+
       test('initial INCOGNITO BLOCK state is correct', function() {
         var contentType = settings.ContentSettingsTypes.COOKIES;
         var categorySubtype = settings.PermissionValues.BLOCK;
         setUpCategory(contentType, categorySubtype, prefsIncognito);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
               assertEquals(categorySubtype, testElement.categorySubtype);
 
               assertEquals(1, testElement.sites.length);
@@ skipping 416 matching lines @@
 
             assertFalse(dialog.$.dialog.open);
           });
     });
   });
 
   return {
     registerTests: registerTests,
   };
 });