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

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

Index: chrome/test/data/webui/settings/device_page_tests.js
diff --git a/chrome/test/data/webui/settings/device_page_tests.js b/chrome/test/data/webui/settings/device_page_tests.js
index 93ed9f4ea4495bfd3e3ba3dc89830fe175cb10a1..20e728e9588950490612e801db19678a68acf548 100644
--- a/chrome/test/data/webui/settings/device_page_tests.js
+++ b/chrome/test/data/webui/settings/device_page_tests.js
@@ -165,15 +165,14 @@ cr.define('device_page_tests', function() {
     });
 
     /** @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);
       });
     };
@@ -213,13 +212,13 @@ cr.define('device_page_tests', 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);
@@ -227,7 +226,7 @@ cr.define('device_page_tests', function() {
         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);
@@ -239,12 +238,12 @@ cr.define('device_page_tests', function() {
 
           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);
@@ -252,7 +251,7 @@ cr.define('device_page_tests', function() {
           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);
@@ -326,7 +325,8 @@ cr.define('device_page_tests', function() {
 
     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'));
@@ -420,7 +420,8 @@ cr.define('device_page_tests', function() {
       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.