MD Settings: Internet: Move network lists to a subpage

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

Index: chrome/test/data/webui/settings/internet_page_tests.js
diff --git a/chrome/test/data/webui/settings/internet_page_tests.js b/chrome/test/data/webui/settings/internet_page_tests.js
index 7ef4f5e28722dda97cab096c29a6f2749048b006..f6d3fae5d9c109bed440874f454f063732d4d0e9 100644
--- a/chrome/test/data/webui/settings/internet_page_tests.js
+++ b/chrome/test/data/webui/settings/internet_page_tests.js
@@ -10,7 +10,7 @@ suite('Internet', function() {
   var networkSummary_ = null;
 
   /** @type {NetworkingPrivate} */
-  var networkingPrivateApi_;
+  var api_;
 
   suiteSetup(function() {
     loadTimeData.overrideValues({
@@ -39,29 +39,29 @@ suite('Internet', function() {
       vpnNameTemplate: 'vpnNameTemplate',
     };
 
-    networkingPrivateApi_ = new settings.FakeNetworkingPrivate();
+    api_ = new settings.FakeNetworkingPrivate();
 
     // Disable animations so sub-pages open within one event loop.
     testing.Test.disableAnimationsAndTransitions();
   });
 
-  suite('MainPage', function() {
-    setup(function() {
-      PolymerTest.clearBody();
-      internetPage = document.createElement('settings-internet-page');
-      assertTrue(!!internetPage);
-      networkingPrivateApi_.resetForTest();
-      internetPage.networkingPrivate = networkingPrivateApi_;
-      document.body.appendChild(internetPage);
-      networkSummary_ = internetPage.$$('network-summary');
-      assertTrue(!!networkSummary_);
-      Polymer.dom.flush();
-    });
+  setup(function() {
+    PolymerTest.clearBody();
+    internetPage = document.createElement('settings-internet-page');
+    assertTrue(!!internetPage);
+    api_.resetForTest();
+    internetPage.networkingPrivate = api_;
+    document.body.appendChild(internetPage);
+    networkSummary_ = internetPage.$$('network-summary');
+    assertTrue(!!networkSummary_);
+    Polymer.dom.flush();
+  });
 
-    teardown(function() {
-      internetPage.remove();
-    });
+  teardown(function() {
+    internetPage.remove();
+  });
 
+  suite('MainPage', function() {
     test('Ethernet', function() {
       // Default fake device state is Ethernet enabled only.
       var ethernet = networkSummary_.$$('#Ethernet');
@@ -74,11 +74,11 @@ suite('Internet', function() {
     });
 
     test('WiFi', function() {
-      networkingPrivateApi_.addNetworksForTest([
+      api_.addNetworksForTest([
         {GUID: 'wifi1_guid', Name: 'wifi1', Type: 'WiFi'},
         {GUID: 'wifi12_guid', Name: 'wifi2', Type: 'WiFi'},
       ]);
-      networkingPrivateApi_.enableNetworkType('WiFi');
+      api_.enableNetworkType('WiFi');
       Polymer.dom.flush();
       var wifi = networkSummary_.$$('#WiFi');
       assertTrue(!!wifi);
@@ -86,17 +86,15 @@ suite('Internet', function() {
     });
 
     test('WiFiToggle', function() {
-      var api = networkingPrivateApi_;
-
       // Make WiFi an available but disabled technology.
-      api.disableNetworkType('WiFi');
+      api_.disableNetworkType('WiFi');
       Polymer.dom.flush();
       var wifi = networkSummary_.$$('#WiFi');
       assertTrue(!!wifi);
 
       // Ensure that the initial state is disabled and the toggle is
       // enabled but unchecked.
-      assertEquals('Disabled', api.getDeviceStateForTest('WiFi').State);
+      assertEquals('Disabled', api_.getDeviceStateForTest('WiFi').State);
       var toggle = wifi.$$('#deviceEnabledButton');
       assertTrue(!!toggle);
       assertTrue(toggle.enabled);
@@ -106,7 +104,74 @@ suite('Internet', function() {
       MockInteractions.tap(toggle);
       Polymer.dom.flush();
       assertTrue(toggle.checked);
-      assertEquals('Enabled', api.getDeviceStateForTest('WiFi').State);
+      assertEquals('Enabled', api_.getDeviceStateForTest('WiFi').State);
+    });
+  });
+
+  suite('SubPage', function() {
+    test('WiFi', function() {
+      api_.addNetworksForTest([
+        {GUID: 'wifi1_guid', Name: 'wifi1', Type: 'WiFi'},
+        {GUID: 'wifi12_guid', Name: 'wifi2', Type: 'WiFi'},
+      ]);
+      api_.enableNetworkType('WiFi');
+      Polymer.dom.flush();
+      var wifi = networkSummary_.$$('#WiFi');
+      assertTrue(!!wifi);
+      MockInteractions.tap(wifi.$$('button.subpage-arrow'));
+      var subpage = internetPage.$$('settings-internet-subpage');
+      assertTrue(!!subpage);
+      assertEquals(2, subpage.networkStateList_.length);
+      var networkList = subpage.$$('#networkList');
+      assertTrue(!!networkList);
+      assertEquals(2, networkList.networks.length);
+    });
+
+    test('VPN', function() {
+      api_.addNetworksForTest([
+        {GUID: 'vpn1_guid', Name: 'vpn1', Type: 'VPN'},
+        {GUID: 'vpn2_guid', Name: 'vpn1', Type: 'VPN'},
+        {
+          GUID: 'third_party1_vpn1_guid',
+          Name: 'vpn3',
+          Type: 'VPN',
+          VPN: {
+            Type: 'ThirdPartyVPN',
+            ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
+          }
+        },
+        {
+          GUID: 'third_party1_vpn2_guid',
+          Name: 'vpn4',
+          Type: 'VPN',
+          VPN: {
+            Type: 'ThirdPartyVPN',
+            ThirdPartyVPN: {ExtensionID: 'id1', ProviderName: 'pname1'}
+          }
+        },
+        {
+          GUID: 'third_party2_vpn1_guid',
+          Name: 'vpn5',
+          Type: 'VPN',
+          VPN: {
+            Type: 'ThirdPartyVPN',
+            ThirdPartyVPN: {ExtensionID: 'id2', ProviderName: 'pname2'}
+          }
+        },
+      ]);
+      api_.onNetworkListChanged.callListeners();
+      Polymer.dom.flush();
+      var vpn = networkSummary_.$$('#VPN');
+      assertTrue(!!vpn);
+      MockInteractions.tap(vpn.$$('button.subpage-arrow'));
+      var subpage = internetPage.$$('settings-internet-subpage');
+      assertTrue(!!subpage);
+      assertEquals(2, subpage.networkStateList_.length);
+      var networkList = subpage.$$('#networkList');
+      assertTrue(!!networkList);
+      assertEquals(2, networkList.networks.length);
+      // TODO(stevenjb): Implement fake management API and test third
+      // party provider sections.
     });
   });
 });