MD Settings: Migrating site_details_permission to native select.

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

Index: chrome/test/data/webui/settings/site_details_permission_tests.js
diff --git a/chrome/test/data/webui/settings/site_details_permission_tests.js b/chrome/test/data/webui/settings/site_details_permission_tests.js
index be6276338aa6d846fcb0d7dca9f803bbed653712..556c7b06699ba1c1144d47762f555ffdd6876bb8 100644
--- a/chrome/test/data/webui/settings/site_details_permission_tests.js
+++ b/chrome/test/data/webui/settings/site_details_permission_tests.js
@@ -70,16 +70,17 @@ cr.define('site_details_permission', function() {
         return false;
       };
 
-      function validatePermissionFlipWorks(origin, allow) {
-        MockInteractions.tap(allow ? testElement.$.allow : testElement.$.block);
+      function validatePermissionFlipWorks(origin, expectedPermissionValue) {

[dschuyler, 2016/10/05 22:23:17]

|expectedPermissionValue|, I like it!

[dpapad, 2016/10/05 22:41:47]

Done. I also merged 4 calls to
"browserProxy.resetResolver('setCategoryPermissionForOrigin');" to a single
call.

+        // Simulate permission change initiated by the user.
+        testElement.$.permission.value = expectedPermissionValue;
+        testElement.$.permission.dispatchEvent(new CustomEvent('change'));
+
         return browserProxy.whenCalled('setCategoryPermissionForOrigin').then(
-            function(arguments) {
-              assertEquals(origin, arguments[0]);
-              assertEquals('', arguments[1]);
-              assertEquals(testElement.category, arguments[2]);
-              assertEquals(allow ?
-                  settings.PermissionValues.ALLOW :
-                  settings.PermissionValues.BLOCK, arguments[3]);
+            function(args) {
+              assertEquals(origin, args[0]);
+              assertEquals('', args[1]);
+              assertEquals(testElement.category, args[2]);
+              assertEquals(expectedPermissionValue, args[3]);
             });
       };
 
@@ -114,13 +115,16 @@ cr.define('site_details_permission', function() {
               'Widget should be labelled correctly');
 
           // Flip the permission and validate that prefs stay in sync.
-          return validatePermissionFlipWorks(origin, true);
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.ALLOW);
         }).then(function() {
           browserProxy.resetResolver('setCategoryPermissionForOrigin');
-          return validatePermissionFlipWorks(origin, false);
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.BLOCK);
         }).then(function() {
           browserProxy.resetResolver('setCategoryPermissionForOrigin');
-          return validatePermissionFlipWorks(origin, true);
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.ALLOW);
         });
       });
 
@@ -141,19 +145,17 @@ cr.define('site_details_permission', function() {
           assertEquals('Cookies', header.innerText.trim(),
               'Widget should be labelled correctly');
 
-          MockInteractions.tap(testElement.$.sessionOnly);
-          return browserProxy.whenCalled('setCategoryPermissionForOrigin');
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.SESSION_ONLY);
         }).then(function(arguments) {

[dschuyler, 2016/10/05 22:23:17]

Let's remove the |arguments| arg (it's not used now).

-          assertEquals(origin, arguments[0]);
-          assertEquals('', arguments[1]);
-          assertEquals(testElement.category, arguments[2]);
-          assertEquals(settings.PermissionValues.SESSION_ONLY, arguments[3]);
           // Flip the permission and validate that prefs stay in sync.
           browserProxy.resetResolver('setCategoryPermissionForOrigin');
-          return validatePermissionFlipWorks(origin, true);
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.ALLOW);
         }).then(function() {
           browserProxy.resetResolver('setCategoryPermissionForOrigin');
-          return validatePermissionFlipWorks(origin, false);
+          return validatePermissionFlipWorks(
+              origin, settings.PermissionValues.BLOCK);
         });
       });