[MD settings] unit test for incognito activation

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

Index: chrome/test/data/webui/settings/site_list_tests.js
diff --git a/chrome/test/data/webui/settings/site_list_tests.js b/chrome/test/data/webui/settings/site_list_tests.js
index 1cf86362890a2406b1f47cd4565e5d0099f97ea5..3c9253120c6ef7dac7bef344c01a4f6e8b189720 100644
--- a/chrome/test/data/webui/settings/site_list_tests.js
+++ b/chrome/test/data/webui/settings/site_list_tests.js
@@ -59,6 +59,24 @@ cr.define('site_list', function() {
   };
 
   /**
+   * 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}
    */
@@ -171,6 +189,7 @@ cr.define('site_list', function() {
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo.com',
+          incognito: false,
           origin: 'https://foo.com',
           setting: 'allow',
           source: 'preference',
@@ -178,6 +197,7 @@ cr.define('site_list', function() {
         {
           category: 'geolocation',
           embeddingOrigin: 'https://bar.com',
+          incognito: false,
           origin: 'https://bar.com',
           setting: 'block',
           source: 'preference',
@@ -191,6 +211,7 @@ cr.define('site_list', function() {
         {
           category: 'notifications',
           embeddingOrigin: 'https://google.com',
+          incognito: false,
           origin: 'https://google.com',
           setting: 'block',
           source: 'preference',
@@ -198,6 +219,7 @@ cr.define('site_list', function() {
         {
           category: 'notifications',
           embeddingOrigin: 'https://bar.com',
+          incognito: false,
           origin: 'https://bar.com',
           setting: 'block',
           source: 'preference',
@@ -205,6 +227,7 @@ cr.define('site_list', function() {
         {
           category: 'notifications',
           embeddingOrigin: 'https://foo.com',
+          incognito: false,
           origin: 'https://foo.com',
           setting: 'block',
           source: 'preference',
@@ -227,6 +250,7 @@ cr.define('site_list', function() {
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo-allow.com:443',
+          incognito: false,
           origin: 'https://foo-allow.com:443',
           setting: 'allow',
           source: 'preference',
@@ -245,6 +269,7 @@ cr.define('site_list', function() {
         {
           category: 'geolocation',
           embeddingOrigin: 'https://foo-block.com:443',
+          incognito: false,
           origin: 'https://foo-block.com:443',
           setting: 'block',
           source: 'preference',
@@ -263,6 +288,7 @@ cr.define('site_list', function() {
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-block.com',
+          incognito: false,
           origin: 'http://foo-block.com',
           setting: 'block',
           source: 'preference',
@@ -270,6 +296,7 @@ cr.define('site_list', function() {
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-allow.com',
+          incognito: false,
           origin: 'http://foo-allow.com',
           setting: 'allow',
           source: 'preference',
@@ -277,6 +304,7 @@ cr.define('site_list', function() {
         {
           category: 'cookies',
           embeddingOrigin: 'http://foo-session.com',
+          incognito: false,
           origin: 'http://foo-session.com',
           setting: 'session_only',
           source: 'preference',
@@ -334,6 +362,7 @@ cr.define('site_list', function() {
         {
           category: 'javascript',
           embeddingOrigin: '',
+          incognito: false,
           origin: 'chrome-extension://cfhgfbfpcbnnbibfphagcjmgjfjmojfa/',
           setting: 'block',
           source: 'preference',
@@ -414,6 +443,20 @@ cr.define('site_list', function() {
       }
 
       /**
+       * @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.
@@ -594,6 +637,43 @@ cr.define('site_list', function() {
             });
       });
 
+      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;