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..c35a965921ac6b91bcb1f365eef87ed860994c53 100644
--- a/chrome/test/data/webui/settings/internet_page_tests.js
+++ b/chrome/test/data/webui/settings/internet_page_tests.js
@@ -45,23 +45,23 @@ suite('Internet', function() {
     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);
+    networkingPrivateApi_.resetForTest();
+    internetPage.networkingPrivate = networkingPrivateApi_;
+    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');
@@ -109,4 +109,73 @@ suite('Internet', function() {
       assertEquals('Enabled', api.getDeviceStateForTest('WiFi').State);
     });
   });
+
+  suite('SubPage', function() {
+    test('WiFi', function() {
+      var api = networkingPrivateApi_;

[michaelpg, 2017/03/01 23:27:59]

is this just to have a shortcut? networkingPrivateApi_ is only used twice :-\

[stevenjb, 2017/03/02 00:25:17]

Yeah but it's long and makes the second usage ugly. We do this a few places,
I'll just rename the variable...

+
+      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() {
+      networkingPrivateApi_.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'}
+          }
+        },
+      ]);
+      networkingPrivateApi_.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.
+    });
+  });
 });