Settings: Network: Merge Tether networks into Mobile 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 70edfaec5133341f7db51a87c648f2bcc94bae05..5582a5bef584b672e54fc32820c1cfdbbb9516db 100644
--- a/chrome/test/data/webui/settings/internet_page_tests.js
+++ b/chrome/test/data/webui/settings/internet_page_tests.js
@@ -28,6 +28,7 @@ suite('Internet', function() {
     CrOncStrings = {
       OncTypeCellular: 'OncTypeCellular',
       OncTypeEthernet: 'OncTypeEthernet',
+      OncTypeTether: 'OncTypeTether',
       OncTypeVPN: 'OncTypeVPN',
       OncTypeWiFi: 'OncTypeWiFi',
       OncTypeWiMAX: 'OncTypeWiMAX',
@@ -119,12 +120,48 @@ suite('Internet', function() {
       assertTrue(!!wifi);
       MockInteractions.tap(wifi.$$('button.subpage-arrow'));
       Polymer.dom.flush();
-      var subpage = internetPage.$$('settings-internet-subpage');
-      assertTrue(!!subpage);
-      assertEquals(2, subpage.networkStateList_.length);
-      var networkList = subpage.$$('#networkList');
-      assertTrue(!!networkList);
-      assertEquals(2, networkList.networks.length);
+      // Allow dom-if templates to resolve.
+      Polymer.Base.async(function() {
+        var subpage = internetPage.$$('settings-internet-subpage');
+        assertTrue(!!subpage);
+        assertEquals(2, subpage.networkStateList_.length);
+        var toggle = wifi.$$('#deviceEnabledButton');
+        assertTrue(!!toggle);
+        assertTrue(toggle.enabled);
+        var networkList = subpage.$$('#networkList');
+        assertTrue(!!networkList);
+        assertEquals(2, networkList.networks.length);
+      });
+    });
+
+    test('Tether', function() {

[Kyle Horimoto, 2017/06/01 20:15:21]

nit: Can we also test cases where only one of the two types is enabled?

Also, do you think it makes sense to verify that the actual network metadata is
present in the DOM instead of only verifying that there are 3 networks? I'm not
sure if this is valuable or not.

[stevenjb, 2017/06/01 21:55:03]

1) Yes.
2) No, I don't think that is especially valuable. We're generating the fake data
in the test itself, and in my experience, UI tests that are too specific are
more likely to generate false positives than catch real regression. I prefer to
just ensure that critical elements exist and are receiving data from the model.

+      api_.addNetworksForTest([
+        {GUID: 'cellular1_guid', Name: 'cellular1', Type: 'Cellular'},
+        {GUID: 'tether1_guid', Name: 'tether1', Type: 'Tether'},
+        {GUID: 'tether2_guid', Name: 'tether2', Type: 'Tether'},
+      ]);
+      api_.enableNetworkType('Cellular');
+      api_.enableNetworkType('Tether');
+      Polymer.dom.flush();
+      // Allow dom-if templates to resolve.
+      Polymer.Base.async(function() {
+        var mobile = networkSummary_.$$('#Cellular');
+        assertTrue(!!mobile);
+        MockInteractions.tap(mobile.$$('button.subpage-arrow'));
+        Polymer.dom.flush();
+        var subpage = internetPage.$$('settings-internet-subpage');
+        assertTrue(!!subpage);
+        assertEquals(3, subpage.networkStateList_.length);
+        var toggle = mobile.$$('#deviceEnabledButton');
+        assertTrue(!!toggle);
+        assertTrue(toggle.enabled);
+        var networkList = subpage.$$('#networkList');
+        assertTrue(!!networkList);
+        assertEquals(3, networkList.networks.length);
+        var tetherToggle = mobile.$$('#tetherEnabledButton');
+        assertTrue(!!tetherToggle);
+        assertTrue(tetherToggle.enabled);
+      });
     });
 
     test('VPN', function() {
@@ -161,18 +198,21 @@ suite('Internet', function() {
       ]);
       api_.onNetworkListChanged.callListeners();
       Polymer.dom.flush();
-      var vpn = networkSummary_.$$('#VPN');
-      assertTrue(!!vpn);
-      MockInteractions.tap(vpn.$$('button.subpage-arrow'));
-      Polymer.dom.flush();
-      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.
+      // Allow dom-if templates to resolve.
+      Polymer.Base.async(function() {
+        var vpn = networkSummary_.$$('#VPN');
+        assertTrue(!!vpn);
+        MockInteractions.tap(vpn.$$('button.subpage-arrow'));
+        Polymer.dom.flush();
+        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.
+      });
     });
   });
 });