arc: Handle ARC events in MD Settings

chrome/test/data/webui/settings/android_apps_page_test.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.
 
 /**
  * @constructor
  * @implements {settings.AndroidAppsBrowserProxy}
  * @extends {settings.TestBrowserProxy}
  */
 function TestAndroidAppsBrowserProxy() {
   settings.TestBrowserProxy.call(this, [
     'requestAndroidAppsInfo',
     'showAndroidAppsSettings',
   ]);
 }
 
 TestAndroidAppsBrowserProxy.prototype = {
   __proto__: settings.TestBrowserProxy.prototype,
 
   /** @override */
   requestAndroidAppsInfo: function() {
     this.methodCalled('requestAndroidAppsInfo');
-    cr.webUIListenerCallback('android-apps-info-update', {appReady: false});
+    this.setAndroidAppsState(false, false);
   },
 
   /** override */
   showAndroidAppsSettings: function(keyboardAction) {
     this.methodCalled('showAndroidAppsSettings');
   },
 
-  setAppReady: function(ready) {
+  setAndroidAppsState: function(playStoreEnabled, settingsAppAvailable) {
     // We need to make sure to pass a new object here, otherwise the property
     // change event may not get fired in the listener.
-    cr.webUIListenerCallback('android-apps-info-update', {appReady: ready});
+    var appsInfo = {
+      playStoreEnabled: playStoreEnabled,
+      settingsAppAvailable: settingsAppAvailable,
+    };
+    cr.webUIListenerCallback('android-apps-info-update', appsInfo);
   },
 };
 
 /** @type {?SettingsAndroidAppsPageElement} */
 var androidAppsPage = null;
 
 /** @type {?TestAndroidAppsBrowserProxy} */
 var androidAppsBrowserProxy = null;
 
 suite('AndroidAppsPageTests', function() {
@@ skipping 10 matching lines @@
     androidAppsPage.remove();
   });
 
   suite('Main Page', function() {
     setup(function() {
       androidAppsPage.prefs = {arc: {enabled: {value: false}}};
       Polymer.dom.flush();
 
       return androidAppsBrowserProxy.whenCalled('requestAndroidAppsInfo')
           .then(function() {
-            androidAppsBrowserProxy.setAppReady(false);
+            androidAppsBrowserProxy.setAndroidAppsState(false, false);
           });
     });
 
     test('Enable', function() {
       var button = androidAppsPage.$$('#enable');
       assertTrue(!!button);
       assertFalse(!!androidAppsPage.$$('.subpage-arrow'));
 
       MockInteractions.tap(button);
       Polymer.dom.flush();
       assertTrue(androidAppsPage.prefs.arc.enabled.value);
 
-      androidAppsBrowserProxy.setAppReady(true);
+      androidAppsBrowserProxy.setAndroidAppsState(true, false);
       Polymer.dom.flush();
       assertTrue(!!androidAppsPage.$$('.subpage-arrow'));
     });
   });
 
   suite('SubPage', function() {
     var subpage;
 
+    /**
+     * Returns a new promise that resolves after a window 'popstate' event.
+     * @return {!Promise}
+     */
+    function whenPopState() {
+      return new Promise(function(resolve) {
+        window.addEventListener('popstate', function callback() {
+          window.removeEventListener('popstate', callback);
+          resolve();
+        });
+      });
+    }
+
     setup(function() {
       androidAppsPage.prefs = {arc: {enabled: {value: true}}};
       return androidAppsBrowserProxy.whenCalled('requestAndroidAppsInfo')
           .then(function() {
-            androidAppsBrowserProxy.setAppReady(true);
+            settings.navigateTo(settings.Route.ANDROID_APPS);
+            androidAppsBrowserProxy.setAndroidAppsState(true, false);
             MockInteractions.tap(androidAppsPage.$$('#android-apps'));
             Polymer.dom.flush();
             subpage = androidAppsPage.$$('settings-android-apps-subpage');
             assertTrue(!!subpage);
           });
     });
 
+    teardown(function() {
+      androidAppsPage.discardForTest();

[stevenjb, 2017/05/11 19:40:43]

Instead of adding extra test specific code to the production JS, we should be
able to address this by moving:

 androidAppsPage = document.createElement('settings-android-apps-page');
 document.body.appendChild(androidAppsPage);

and

 androidAppsPage.remove();

From the AndroidAppsPageTests suite setup/teardown to each individual suite
setup/teardown.

(This was an oversight when I introduced the subpage).

[stevenjb, 2017/05/11 19:48:37]

(Note there are 3 sub-suites, 'Main Page' 'SubPage' and 'Enforced', you'll need
to move these to each sub suite, but I just verified that works OK and it
-should- address the problem you were seeing. Feel free to ping me if it does
not).

[khmel, 2017/05/11 20:26:42]

Done as we discussed in chat. attached/detached

+    });
+
     test('Sanity', function() {
+      assertTrue(!!subpage.$$('#remove'));
       assertTrue(!!subpage.$$('#manageApps'));
-      assertTrue(!!subpage.$$('#remove'));
+    });
+
+    test('ManageAppsUpdate', function() {
+      var manageApps = subpage.$$('#manageApps');
+      assertTrue(manageApps.hidden);
+      androidAppsBrowserProxy.setAndroidAppsState(true, true);
+      Polymer.dom.flush();
+      assertFalse(manageApps.hidden);
+      androidAppsBrowserProxy.setAndroidAppsState(true, false);
+      Polymer.dom.flush();
+      assertTrue(manageApps.hidden);
     });
 
     test('Disable', function() {
       var dialog = subpage.$$('#confirmDisableDialog');
       assertTrue(!!dialog);
       assertFalse(dialog.open);
 
       var remove = subpage.$$('#remove');
       assertTrue(!!remove);
-      MockInteractions.tap(remove);
 
+      subpage.onRemoveTap_();
       Polymer.dom.flush();
       assertTrue(dialog.open);
     });
+
+    test('HideOnDisable', function() {
+      assertEquals(settings.getCurrentRoute(),
+                   settings.Route.ANDROID_APPS_DETAILS);
+      androidAppsBrowserProxy.setAndroidAppsState(false, false);
+      Polymer.dom.flush();
+      return whenPopState().then(function() {
+        assertEquals(settings.getCurrentRoute(),
+            settings.Route.ANDROID_APPS);
+      });
+    });
   });
 
   suite('Enforced', function() {
     var subpage;
 
     setup(function() {
       androidAppsPage.prefs = {
         arc: {
           enabled: {
             value: true,
             enforcement: chrome.settingsPrivate.Enforcement.ENFORCED
           }
         }
       };
       return androidAppsBrowserProxy.whenCalled('requestAndroidAppsInfo')
           .then(function() {
-            androidAppsBrowserProxy.setAppReady(true);
+            androidAppsBrowserProxy.setAndroidAppsState(true, true);
             MockInteractions.tap(androidAppsPage.$$('#android-apps'));
             Polymer.dom.flush();
             subpage = androidAppsPage.$$('settings-android-apps-subpage');
             assertTrue(!!subpage);
           });
     });
 
     test('Sanity', function() {
       Polymer.dom.flush();
       assertTrue(!!subpage.$$('#manageApps'));
       assertFalse(!!subpage.$$('#remove'));
     });
   });
 });