Settings Router Refactor: Replace route.subpage usage with route.path

chrome/test/data/webui/settings/device_page_tests.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('device_page_tests', function() {
   /** @enum {string} */
   var TestNames = {
     DevicePage: 'device page',
     Display: 'display',
     Keyboard: 'keyboard',
@@ skipping 147 matching lines @@
       var basicPage = document.createElement('div');
       basicPage.dataset.page = 'basic';
       basicPage.appendChild(devicePage);
       document.body.appendChild(basicPage);
 
       // Allow the light DOM to be distributed to settings-animated-pages.
       setTimeout(done);
     });
 
     /** @return {!Promise<!HTMLElement>} */
-    function showAndGetDeviceSubpage(subpage) {
+    function showAndGetDeviceSubpage(subpage, expectedRoute) {
       return new Promise(function(resolve, reject) {
         var row = assert(devicePage.$$('#main #' + subpage + 'Row'));
         devicePage.$.pages.addEventListener('neon-animation-finish', resolve);
         MockInteractions.tap(row);
       }).then(function() {
-        assertEquals('device', settings.getCurrentRoute().section);
-        assertEquals(subpage, settings.getCurrentRoute().subpage[0]);
-        var page = devicePage.$$('#' + subpage + ' settings-' + subpage);
+        assertEquals(expectedRoute, settings.getCurrentRoute());
+        var page = devicePage.$$('settings-' + subpage);
         return assert(page);
       });
     };
 
     /**
      * @param {!HTMLElement} pointersPage
      * @param {Boolean} expected
      */
     function expectNaturalScrollValue(pointersPage, expected) {
       var naturalScrollOff =
@@ skipping 19 matching lines @@
       cr.webUIListenerCallback('has-touchpad-changed', false);
       expectEquals(0, devicePage.$.pointersRow.offsetHeight);
       cr.webUIListenerCallback('has-mouse-changed', true);
       expectLT(0, devicePage.$.pointersRow.offsetHeight);
     });
 
     suite(assert(TestNames.Pointers), function() {
       var pointersPage;
 
       setup(function() {
-        return showAndGetDeviceSubpage('pointers').then(function(page) {
-          pointersPage = page;
-        });
+        return showAndGetDeviceSubpage(
+            'pointers', settings.Route.POINTERS).then(function(page) {
+              pointersPage = page;
+            });
       });
 
       test('subpage responds to pointer attach/detach', function() {
-        assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
         assertTrue(settings.getCurrentRoute() == settings.Route.POINTERS);
         assertLT(0, pointersPage.$.mouse.offsetHeight);
         assertLT(0, pointersPage.$.touchpad.offsetHeight);
         assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
         assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
 
         cr.webUIListenerCallback('has-touchpad-changed', false);
-        assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
+        assertTrue(settings.getCurrentRoute() == settings.Route.POINTERS);

[michaelpg, 2016/08/11 03:41:13]

err, why not assertEquals, here and the others below?

[tommycli, 2016/08/11 19:15:02]

Done.

         assertLT(0, pointersPage.$.mouse.offsetHeight);
         assertEquals(0, pointersPage.$.touchpad.offsetHeight);
         assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
         assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
 
         // Wait for the transition back to the main page.
         return new Promise(function(resolve, reject) {
           devicePage.$.pages.addEventListener('neon-animation-finish', resolve);
 
           cr.webUIListenerCallback('has-mouse-changed', false);
         }).then(function() {
-          assertEquals(0, settings.getCurrentRoute().subpage.length);
+          assertTrue(settings.getCurrentRoute() == settings.Route.DEVICE);
           assertEquals(0, devicePage.$$('#main #pointersRow').offsetHeight);
 
           cr.webUIListenerCallback('has-touchpad-changed', true);
           assertLT(0, devicePage.$$('#main #pointersRow').offsetHeight);
-          return showAndGetDeviceSubpage('pointers');
+          return showAndGetDeviceSubpage('pointers', settings.Route.POINTERS);
         }).then(function(page) {
           assertEquals(0, pointersPage.$.mouse.offsetHeight);
           assertLT(0, pointersPage.$.touchpad.offsetHeight);
           assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
           assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
 
           cr.webUIListenerCallback('has-mouse-changed', true);
-          assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
+          assertTrue(settings.getCurrentRoute() == settings.Route.POINTERS);
           assertLT(0, pointersPage.$.mouse.offsetHeight);
           assertLT(0, pointersPage.$.touchpad.offsetHeight);
           assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
           assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
         });
       });
 
       test('mouse', function() {
         expectLT(0, pointersPage.$.mouse.offsetHeight);
 
@@ skipping 53 matching lines @@
           Polymer.Base.async(function() {
             expectNaturalScrollValue(pointersPage, true);
             done();
           }, 1);
         }, 1);
       });
     });
 
     test(assert(TestNames.Keyboard), function() {
       // Open the keyboard subpage.
-      return showAndGetDeviceSubpage('keyboard').then(function(keyboardPage) {
+      return showAndGetDeviceSubpage(
+          'keyboard', settings.Route.KEYBOARD).then(function(keyboardPage) {
         // Initially, the optional keys are hidden.
         expectFalse(!!keyboardPage.$$('#capsLockKey'));
         expectFalse(!!keyboardPage.$$('#diamondKey'));
 
         // Pretend the diamond key is available.
         var showCapsLock = false;
         var showDiamondKey = true;
         cr.webUIListenerCallback(
             'show-keys-changed', showCapsLock, showDiamondKey);
         Polymer.dom.flush();
@@ skipping 73 matching lines @@
             width: 1920,
             height: 1080,
           },
         };
         fakeSystemDisplay.addDisplayForTest(display);
       };
 
       var displayPage;
       return Promise.all([
         // Get the display sub-page.
-        showAndGetDeviceSubpage('display').then(function(page) {
+        showAndGetDeviceSubpage(
+            'display', settings.Route.DISPLAY).then(function(page) {
           displayPage = page;
         }),
         // Wait for the initial call to getInfo.
         fakeSystemDisplay.getInfoCalled.promise,
       ]).then(function() {
         // Add a display.
         addDisplay(1);
         fakeSystemDisplay.onDisplayChanged.callListeners();
 
         return Promise.all([
@@ skipping 77 matching lines @@
         expectTrue(displayPage.showMirror_(displayPage.displays));
         expectTrue(displayPage.isMirrored_(displayPage.displays));
       });
     });
   });
 
   return {
     TestNames: TestNames
   };
 });