MD Settings: Certificates: Add 'Import and bind' button for CrOS

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

 // Copyright 2016 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.
 
 cr.define('certificate_manager_page', function() {
   /**
    * A test version of CertificatesBrowserProxy. Provides helper methods
    * for allowing tests to know when a method was called, as well as
    * specifying mock responses.
    *
@@ skipping 11 matching lines @@
       'getCaCertificateTrust',
       'importCaCertificate',
       'importCaCertificateTrustSelected',
       'importPersonalCertificate',
       'importPersonalCertificatePasswordSelected',
       'importServerCertificate',
       'refreshCertificates',
       'viewCertificate',
     ]);
 
+    /** @type {boolean} */
+    this.useHardwareBacked = false;
+
     /** @private {!CaTrustInfo} */
     this.caTrustInfo_ = {ssl: true, email: true, objSign: true};
 
     /** @private {?CertificatesError} */
     this.certificatesError_ = null;
   };
 
   TestCertificatesBrowserProxy.prototype = {
     __proto__: settings.TestBrowserProxy.prototype,
 
@@ skipping 64 matching lines @@
     },
 
     /** @override */
     exportPersonalCertificatePasswordSelected: function(password) {
       this.resolverMap_.get(
           'exportPersonalCertificatePasswordSelected').resolve(password);
       return this.fulfillRequest_();
     },
 
     /** @override */
-    importPersonalCertificate: function() {
+    importPersonalCertificate: function(useHardwareBacked) {
+      this.useHardwareBacked = useHardwareBacked;
       this.methodCalled('importPersonalCertificate');
       return Promise.resolve(true);

[dpapad, 2017/01/24 23:16:03]

This should be 
return Promise.resolve(this.useHardwareBacked);

Then you can assert whether 'importPersonalCertificate' was called with the
right parameters from your test. (See related comment below). 

[stevenjb, 2017/01/25 19:39:35]

Actually, useHardwareBacked can be passed to methodCalled; 'true' is the return
value of importPersonalCertificate (whether to show a password prompt). The test
expects that to be true.

[dpapad, 2017/01/25 21:14:00]

Ah you are right. That is what I origanaly meant, but confused the return value
and the methodCalled params in my suggestion.

     },
 
     /** @override */
     importPersonalCertificatePasswordSelected: function(password) {
       this.resolverMap_.get(
           'importPersonalCertificatePasswordSelected').resolve(password);
       return this.fulfillRequest_();
     },
 
     /** @override */
@@ skipping 663 matching lines @@
       teardown(function() { element.remove(); });
 
       /**
        * Tests the "Import" button functionality.
        * @param {!CertificateType} certificateType
        * @param {string} proxyMethodName The name of the proxy method expected
        *     to be called.
        * @param {boolean} actionEventExpected Whether a
        *     settings.CertificateActionEvent is expected to fire as a result
        *     tapping the Import button.
+       * @param {boolean=} opt_bind Whether to click on the import and bind btn.

[dpapad, 2017/01/24 23:16:03]

Can we make this parameter required? All calls are in this file, so updating
them should be fairly trivial.

[stevenjb, 2017/01/25 19:39:35]

Noisy change imho, but sure.

        */
       function testImportForCertificateType(
-          certificateType, proxyMethodName, actionEventExpected) {
-        element.certificateType = certificateType
+          certificateType, proxyMethodName, actionEventExpected, opt_bind) {
+        element.certificateType = certificateType;
         Polymer.dom.flush();
 
-        var importButton = element.$$('paper-button');
+        var importButton =
+            opt_bind ? element.$$('#importAndBind') : element.$$('#import');
         assertTrue(!!importButton);
 
         var waitForActionEvent = actionEventExpected ?
             test_util.eventToPromise(settings.CertificateActionEvent, element) :
             Promise.resolve(null);
 
         MockInteractions.tap(importButton);
         return browserProxy.whenCalled(proxyMethodName).then(function() {
           return waitForActionEvent;
         }).then(function(event) {
           if (actionEventExpected) {
             assertEquals(
                 CertificateAction.IMPORT, event.detail.action);
             assertEquals(certificateType, event.detail.certificateType);
+            assertTrue(
+                proxyMethodName != 'importPersonalCertificate' ||

[dpapad, 2017/01/24 23:16:03]

Don't fully understand this assertion. Can you explain what does it check?
Shouldn't we be checking what argument (true/false) was passed to the browser
instead?

How about the following 

return browserProxy.whenCalled(proxyMethodName).then(function(arg) {
 if (proxyMethodName == 'importPersonalCertificate') {
   assertEquals(arg, opt_bind);
 }
 return waitForActionEvent;
}).then(...)

[stevenjb, 2017/01/25 19:39:35]

Done.

+                !!opt_bind == browserProxy.useHardwareBacked);
           }
         });
       }
 
       test('ImportButton_Personal', function() {
         return testImportForCertificateType(
             CertificateType.PERSONAL,
             'importPersonalCertificate', true);
       });
 
+      if (cr.isChromeOS) {
+        test('ImportAndBindButton_Personal', function() {
+          return testImportForCertificateType(
+            CertificateType.PERSONAL,
+              'importPersonalCertificate', true, true);
+        });
+      }
+
       test('ImportButton_Server', function() {
         return testImportForCertificateType(
             CertificateType.SERVER, 'importServerCertificate',
             false);
       });
 
       test('ImportButton_CA', function() {
         return testImportForCertificateType(
             CertificateType.CA, 'importCaCertificate', true);
       });
     });
   }
 
   return {
     registerTests: function() {
       registerCaTrustEditDialogTests();
       registerDeleteDialogTests();
       registerPasswordEncryptDialogTests();
       registerPasswordDecryptDialogTests();
       registerPageTests();
       registerCertificateSubentryTests();
       registerCertificateListTests();
     },
   };
 });