md-settings: Fix fingerprint list tests.

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

 // Copyright 2017 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.
 
 /**
  * @constructor
  * @implements {settings.FingerprintBrowserProxy}
  * @extends {settings.TestBrowserProxy}
  */
 var TestFingerprintBrowserProxy = function() {
@@ skipping 108 matching lines @@
     settings.FingerprintBrowserProxyImpl.instance_ = browserProxy;
 
     PolymerTest.clearBody();
     fingerprintList = document.createElement('settings-fingerprint-list');
     document.body.appendChild(fingerprintList);
     dialog = fingerprintList.$.setupFingerprint;
     addAnotherButton = dialog.$.addAnotherButton;
     Polymer.dom.flush();
     return browserProxy.whenCalled('getFingerprintsList').then(function() {
       assertEquals(0, fingerprintList.fingerprints_.length);
+      browserProxy.resetResolver('getFingerprintsList');
     });
   });
 
   // Verify running through the enroll session workflow
   // (settings-setup-fingerprint-dialog) works as expected.
   test('EnrollingFingerprint', function() {
     assertFalse(dialog.$.dialog.open);
     MockInteractions.tap(fingerprintList.$$('.action-button'));
     return browserProxy.whenCalled('startEnroll').then(function() {
       assertTrue(dialog.$.dialog.open);
@@ skipping 25 matching lines @@
           });
     });
   });
 
   // Verify enrolling a fingerprint, then enrolling another without closing the
   // dialog works as intended.
   test('EnrollingAnotherFingerprint', function() {
     assertFalse(dialog.$.dialog.open);
     MockInteractions.tap(fingerprintList.$$('.action-button'));
     return browserProxy.whenCalled('startEnroll').then(function() {
+      browserProxy.resetResolver('startEnroll');
+
       assertTrue(dialog.$.dialog.open);
       assertEquals(0, dialog.receivedScanCount_);
       assertFalse(isVisible(addAnotherButton));
       browserProxy.scanReceived(settings.FingerprintResultType.SUCCESS, true);
       assertEquals(settings.FingerprintSetupStep.READY, dialog.step_);
 
-      // Once the first fingerprint is enrolled, verify that enrolling the
-      // second fingerprint without closing the dialog works as expected.
-      return browserProxy.whenCalled('getFingerprintsList');
-    }).then(function() {
-      assertEquals(1, fingerprintList.fingerprints_.length);
       assertTrue(dialog.$.dialog.open);
       assertTrue(isVisible(addAnotherButton));
       MockInteractions.tap(addAnotherButton);
-      return browserProxy.whenCalled('startEnroll');
+
+      // Once the first fingerprint is enrolled, verify that enrolling the
+      // second fingerprint without closing the dialog works as expected.
+      return Promise.all([
+          browserProxy.whenCalled('startEnroll'),
+          browserProxy.whenCalled('getFingerprintsList')]);
     }).then(function() {
+      browserProxy.resetResolver('getFingerprintsList');
+
       assertTrue(dialog.$.dialog.open);
       assertFalse(isVisible(addAnotherButton));
       browserProxy.scanReceived(settings.FingerprintResultType.SUCCESS, true);
+
+      // Verify that by tapping the continue button we should exit the dialog
+      // and the fingerprint list should have two fingerprints registered.
+      MockInteractions.tap(dialog.$.closeButton);
       return browserProxy.whenCalled('getFingerprintsList');
     }).then(function() {
        assertEquals(2, fingerprintList.fingerprints_.length);
     });
   });
 
   test('CancelEnrollingFingerprint', function() {
     assertFalse(dialog.$.dialog.open);
     MockInteractions.tap(fingerprintList.$$('.action-button'));
     return browserProxy.whenCalled('startEnroll').then(function() {
@@ skipping 11 matching lines @@
     }).then(function() {
       assertEquals(0, fingerprintList.fingerprints_.length);
     });
   });
 
   test('RemoveFingerprint', function() {
     browserProxy.setFingerprints(['Label 1', 'Label 2']);
     fingerprintList.updateFingerprintsList_();
 
     return browserProxy.whenCalled('getFingerprintsList').then(function() {
+      browserProxy.resetResolver('getFingerprintsList');
       assertEquals(2, fingerprintList.fingerprints_.length);
       fingerprintList.onFingerprintDeleteTapped_(createFakeEvent(0));
 
       return Promise.all([
           browserProxy.whenCalled('removeEnrollment'),
           browserProxy.whenCalled('getFingerprintsList')]);
     }).then(function() {
       assertEquals(1, fingerprintList.fingerprints_.length);
     });
   });
@@ skipping 16 matching lines @@
     });
   });
 
   test('AddingNewFingerprint', function() {
     browserProxy.setFingerprints(['1', '2', '3', '4', '5']);
     fingerprintList.updateFingerprintsList_();
 
     // Verify that new fingerprints cannot be added when there are already five
     // registered fingerprints.
     return browserProxy.whenCalled('getFingerprintsList').then(function() {
+      browserProxy.resetResolver('getFingerprintsList');
       assertEquals(5, fingerprintList.fingerprints_.length);
       assertTrue(fingerprintList.$$('.action-button').disabled);
       fingerprintList.onFingerprintDeleteTapped_(createFakeEvent(0));
 
       return Promise.all([
           browserProxy.whenCalled('removeEnrollment'),
           browserProxy.whenCalled('getFingerprintsList')]);
     }).then(function() {
       assertEquals(4, fingerprintList.fingerprints_.length);
       assertFalse(
           fingerprintList.$$('.action-button').disabled);
     });
   });
 });