@inboxsdk/core 0.2.28-alpha.6 → 0.2.28

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/track-gmail-styles.js

@@ -1,95 +1,122 @@
+/* @flow */
+
 import Logger from '../../../lib/logger';
 import waitFor from '../../../lib/wait-for';
 import GmailElementGetter from '../gmail-element-getter';
+
 const RGB_REGEX = /^rgb\s*\(\s*(\d+),\s*(\d+),\s*(\d+)\s*\)/;
-function getDensity() {
-    // get the padding amount on the left-nav-menu entries to find the active
-    // density setting value.
-    const navItemOuter = document.querySelector('.TO .TN');
-    if (!navItemOuter) {
-        Logger.error(new Error('Failed to find nav item outer element'));
-        return 'compact';
-    }
-    const padding = parseInt(getComputedStyle(navItemOuter).getPropertyValue('padding-top'), 10);
-    if (padding >= 6) {
-        return 'comfortable';
-    }
-    else if (padding >= 3) {
-        return 'cozy';
-    }
-    else {
-        return 'compact';
-    }
+
+function getDensity(): string {
+  // get the padding amount on the left-nav-menu entries to find the active
+  // density setting value.
+  const navItemOuter = document.querySelector('.TO .TN');
+  if (!navItemOuter) {
+    Logger.error(new Error('Failed to find nav item outer element'));
+    return 'compact';
+  }
+  const padding = parseInt(
+    getComputedStyle(navItemOuter).getPropertyValue('padding-top'),
+    10
+  );
+  if (padding >= 6) {
+    return 'comfortable';
+  } else if (padding >= 3) {
+    return 'cozy';
+  } else {
+    return 'compact';
+  }
 }
-function isDarkTheme() {
-    // get the color of the left-nav-menu entries to determine whether Gmail is
-    // in dark theme mode.
-    const navItem = document.querySelector('.aio');
-    if (!navItem) {
-        Logger.error(new Error('Failed to find nav item'));
-        return false;
-    }
-    const colorString = getComputedStyle(navItem).getPropertyValue('color');
-    const colorMatch = RGB_REGEX.exec(colorString);
-    if (!colorMatch) {
-        Logger.error(new Error('Failed to read color string'), { colorString });
-        return false;
-    }
-    const r = +colorMatch[1], g = +colorMatch[2], b = +colorMatch[3];
-    // rgb(32, 33, 36) is the default color of nav items in Material Gmail
-    if (r === 32 && g === 33 && b === 36) {
-        return false;
-    }
-    if (r !== g || r !== b) {
-        Logger.error(new Error('Nav item color not grayscale'), { r, g, b });
-    }
-    return r > 128;
+
+function isDarkTheme(): boolean {
+  // get the color of the left-nav-menu entries to determine whether Gmail is
+  // in dark theme mode.
+  const navItem = document.querySelector('.aio');
+  if (!navItem) {
+    Logger.error(new Error('Failed to find nav item'));
+    return false;
+  }
+  const colorString = getComputedStyle(navItem).getPropertyValue('color');
+  const colorMatch = RGB_REGEX.exec(colorString);
+  if (!colorMatch) {
+    Logger.error(new Error('Failed to read color string'), { colorString });
+    return false;
+  }
+  const r = +colorMatch[1],
+    g = +colorMatch[2],
+    b = +colorMatch[3];
+  // rgb(32, 33, 36) is the default color of nav items in Material Gmail
+  if ((r === 32 && g === 33, b === 36)) {
+    return false;
+  }
+  if (r !== g || r !== b) {
+    Logger.error(new Error('Nav item color not grayscale'), { r, g, b });
+  }
+  return r > 128;
 }
+
 export default function trackGmailStyles() {
-    if (document.head.hasAttribute('data-inboxsdk-gmail-style-tracker') ||
-        GmailElementGetter.isStandalone()) {
-        return;
+  if (
+    (document.head: any).hasAttribute('data-inboxsdk-gmail-style-tracker') ||
+    GmailElementGetter.isStandalone()
+  ) {
+    return;
+  }
+  (document.head: any).setAttribute(
+    'data-inboxsdk-gmail-style-tracker',
+    'true'
+  );
+
+  let currentDensity = null;
+  let currentDarkTheme = null;
+
+  function checkStyles() {
+    const newDensity = getDensity();
+    if (currentDensity !== newDensity) {
+      if (currentDensity) {
+        ((document.body: any): HTMLElement).classList.remove(
+          'inboxsdk__gmail_density_' + currentDensity
+        );
+      }
+      currentDensity = newDensity;
+      ((document.body: any): HTMLElement).classList.add(
+        'inboxsdk__gmail_density_' + currentDensity
+      );
     }
-    document.head.setAttribute('data-inboxsdk-gmail-style-tracker', 'true');
-    let currentDensity = null;
-    let currentDarkTheme = null;
-    function checkStyles() {
-        const newDensity = getDensity();
-        if (currentDensity !== newDensity) {
-            if (currentDensity) {
-                document.body.classList.remove('inboxsdk__gmail_density_' + currentDensity);
-            }
-            currentDensity = newDensity;
-            document.body.classList.add('inboxsdk__gmail_density_' + currentDensity);
-        }
-        const newDarkTheme = isDarkTheme();
-        if (currentDarkTheme !== newDarkTheme) {
-            currentDarkTheme = newDarkTheme;
-            if (currentDarkTheme) {
-                document.body.classList.add('inboxsdk__gmail_dark_theme');
-            }
-            else {
-                document.body.classList.remove('inboxsdk__gmail_dark_theme');
-            }
-        }
+
+    const newDarkTheme = isDarkTheme();
+    if (currentDarkTheme !== newDarkTheme) {
+      currentDarkTheme = newDarkTheme;
+      if (currentDarkTheme) {
+        ((document.body: any): HTMLElement).classList.add(
+          'inboxsdk__gmail_dark_theme'
+        );
+      } else {
+        ((document.body: any): HTMLElement).classList.remove(
+          'inboxsdk__gmail_dark_theme'
+        );
+      }
     }
-    waitFor(() => document.querySelector('.TO .TN') && document.querySelector('.aio'))
-        .then(() => {
-        // Gmail changes an inline <style> sheet when the display density changes.
-        // Watch for changes to all <style> elements.
-        const observer = new MutationObserver(checkStyles);
-        const options = {
-            characterData: true,
-            childList: true,
-        };
-        Array.from(document.styleSheets).forEach((sheet) => {
-            if (sheet.ownerNode.tagName == 'STYLE') {
-                observer.observe(sheet.ownerNode, options);
-            }
-        });
-        checkStyles();
+  }
+
+  waitFor(
+    () => document.querySelector('.TO .TN') && document.querySelector('.aio')
+  )
+    .then(() => {
+      // Gmail changes an inline <style> sheet when the display density changes.
+      // Watch for changes to all <style> elements.
+      const observer = new MutationObserver(checkStyles);
+      const options = {
+        characterData: true,
+        childList: true,
+      };
+      Array.from(document.styleSheets).forEach((sheet) => {
+        if ((sheet.ownerNode: any).tagName == 'STYLE') {
+          observer.observe(sheet.ownerNode, options);
+        }
+      });
+      checkStyles();
     })
-        .catch((err) => {
-        Logger.error(err);
+    .catch((err) => {
+      Logger.error(err);
     });
 }

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/user-info.js

@@ -1,28 +1,30 @@
-"use strict";
+/* @flow */
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _find = _interopRequireDefault(require("lodash/find"));
-var _uniqBy = _interopRequireDefault(require("lodash/uniqBy"));
-var _censorHTMLstring = _interopRequireDefault(require("../../../../common/censorHTMLstring"));
-var _logger = _interopRequireDefault(require("../../../lib/logger"));
-var _waitFor = _interopRequireDefault(require("../../../lib/wait-for"));
-class UserInfo {
-  constructor(driver) {
+import find from 'lodash/find';
+import uniqBy from 'lodash/uniqBy';
+import censorHTMLstring from '../../../../common/censorHTMLstring';
+import Logger from '../../../lib/logger';
+import waitFor from '../../../lib/wait-for';
+
+export default class UserInfo {
+  _failedWaitFor: boolean;
+  _userEmail: string;
+
+  constructor(driver: Object) {
     this._failedWaitFor = false;
     this._userEmail = driver.getUserEmailAddress();
   }
 
   // deprecated
-  getUserName() {
+  getUserName(): string {
     const nameEl = document.querySelector('div.gb_w div.gb_B .gb_D');
     if (nameEl) {
       return nameEl.textContent;
     }
-    const contact = (0, _find.default)(this.getAccountSwitcherContactList(), contact => contact.emailAddress === this._userEmail);
+    const contact: Contact = find(
+      this.getAccountSwitcherContactList(),
+      (contact: Contact) => contact.emailAddress === this._userEmail
+    );
     if (contact && contact.name != null) {
       return contact.name;
     }
@@ -30,28 +32,38 @@ class UserInfo {
   }
 
   // deprecated
-  getAccountSwitcherContactList() {
-    const main = Array.from(document.querySelectorAll('[role=banner] div[aria-label] div div a[href^="https://myaccount.google."]')).slice(0, 1).map(btn => {
-      const btnParent = btn.parentElement;
-      const nameEl = btnParent.children[0];
-      const emailAddressEl = btnParent.children[1];
-      if (!nameEl || !emailAddressEl) return null;
-      return {
-        name: nameEl.textContent,
-        emailAddress: emailAddressEl.textContent
-      };
-    }).filter(Boolean);
-    const extras = Array.from(document.querySelectorAll('[role=banner] div[aria-label] div > a[target="_blank"] > img + div')).map(el => {
+  getAccountSwitcherContactList(): Contact[] {
+    const main: Contact[] = Array.from(
+      document.querySelectorAll(
+        '[role=banner] div[aria-label] div div a[href^="https://myaccount.google."]'
+      )
+    )
+      .slice(0, 1)
+      .map((btn: HTMLElement) => {
+        const btnParent: HTMLElement = (btn: any).parentElement;
+        const nameEl = btnParent.children[0];
+        const emailAddressEl = btnParent.children[1];
+        if (!nameEl || !emailAddressEl) return null;
+        return {
+          name: nameEl.textContent,
+          emailAddress: emailAddressEl.textContent,
+        };
+      })
+      .filter(Boolean);
+    const extras: Contact[] = Array.from(
+      document.querySelectorAll(
+        '[role=banner] div[aria-label] div > a[target="_blank"] > img + div'
+      )
+    ).map((el: HTMLElement) => {
       const match = el.children[1].textContent.match(/\S+/);
       if (!match) {
         throw new Error('Failed to match');
       }
       return {
         name: el.children[0].textContent,
-        emailAddress: match[0]
+        emailAddress: match[0],
       };
     });
-    return (0, _uniqBy.default)(main.concat(extras), x => x.emailAddress.toLowerCase());
+    return uniqBy(main.concat(extras), (x) => x.emailAddress.toLowerCase());
   }
 }
-exports.default = UserInfo;

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver/user-info.test.js

@@ -1,85 +1,79 @@
-"use strict";
+/* @flow */
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _lodash = _interopRequireDefault(require("lodash"));
-var _userInfo = _interopRequireDefault(require("./user-info"));
-document.body.innerHTML = '<div role="banner"><div id="slot"></div></div>';
+import _ from 'lodash';
+
+import UserInfo from './user-info';
+
+(document.body: any).innerHTML =
+  '<div role="banner"><div id="slot"></div></div>';
 const slot = document.getElementById('slot');
 if (!slot) throw new Error();
-const driver = {
-  getUserEmailAddress: _lodash.default.constant('cowan@streak.com')
-};
+const driver = { getUserEmailAddress: _.constant('cowan@streak.com') };
+
 describe('old', () => {
   it('normal signed in, plus one normal and one delegated', async () => {
     slot.innerHTML = `
 <div class="gb_w gb_ha" aria-label="Account Information" aria-hidden="true" tabindex="0" img-loaded="1"><div class="gb_J"><div>This account is managed by <b>streak.com</b>.</div><a class="gb_x" href="http://www.google.com/support/accounts/bin/answer.py?answer=181692&amp;hl=en" target="_blank">Learn more</a></div><div class="gb_z"><a class="gb_A gb_ec" href="https://plus.google.com/u/0/me?tab=mX&amp;authuser=0" target="_blank"><div class="gb_g gbip" title="Google+ Profile Icon"></div><span class="gb_C">Change photo</span></a><div class="gb_B"><div class="gb_D">Chris Cowan</div><div class="gb_E">cowan@streak.com</div><div class="gb_y"><a href="https://plus.google.com/u/0/me?tab=mX&amp;authuser=0" target="_blank">Profile</a>–<a href="http://www.google.com/intl/en/policies/privacy/" target="_blank">Privacy</a></div><a class="gb_bc gbp1 gb_a" href="https://myaccount.google.com/?utm_source=OGB&amp;authuser=0" target="_blank">My Account</a></div></div><div class="gb_K" aria-hidden="false"><a class="gb_L gb_O gb_P" target="_blank" rel="noreferrer"><img class="gb_Q" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABECLTFjZCok6-J9wEiC3ZjYXJkX3Bob3RvKihkZjczYTJjY2M2ZmEzNzg0OTk0NzdlM2JmYjg4OWY0ZTNmOTFhZmNiMAEiaDfw7v26ir1rp345NanqFU_MhQ?sz=48" alt="Google+ Profile Icon"><div class="gb_N"><div class="gb_R">Chris Cowan</div><div class="gb_S">cowan@streak.com (default)</div></div></a><a class="gb_L" href="https://mail.google.com/mail/u/1" target="_blank" rel="noreferrer"><img class="gb_Q" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABDCL_nn8ag5pLBGCILdmNhcmRfcGhvdG8qKGJmZjExYmU4ODA5YjhlNDc5OTdmMzhmZDI0YWEyMmUxNTdmNTYzNTIwAbWsPITWijXgBmbaAWa7V0IlI8KH?sz=48" alt="Google+ Profile Icon"><div class="gb_N"><div class="gb_R">Jonny Ive</div><div class="gb_S">streak.web.test.1@gmail.com</div></div></a><a class="gb_L" href="https://mail.google.com/mail/b/143/u/0/" target="_blank" rel="noreferrer"><img class="gb_Q" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABDCNqH_oPv4JWcMyILdmNhcmRfcGhvdG8qKDI5NjUxOGIyNzBjODJkZmI1Y2E1MDllNDU2YzlkNWNjMGMzYTBiNWMwATxsheQ8PeCbYGB49uDPpAo3nqCJ?sz=48" alt="Google+ Profile Icon"><div class="gb_N"><div class="gb_R">Nikola Tesla</div><div class="gb_S">tesla@streak.com (delegated)</div></div></a></div><a class="gb_T gb_c" href="https://plus.google.com/u/0/dashboard" aria-hidden="true"><span class="gb_U gb_2"></span><div class="gb_V">All your Google+ pages ›</div></a><div class="gb_F"><div><a class="gb_9b gb_a" href="https://accounts.google.com/AddSession?hl=en&amp;continue=https://mail.google.com/mail&amp;service=mail" target="_blank">Add account</a></div><div><a class="gb_cc gb_jc gb_a" id="gb_71" href="https://mail.google.com/mail/logout?hl=en" target="_top">Sign out</a></div></div></div>
 `;
-    const userInfo = new _userInfo.default(driver);
+    const userInfo = new UserInfo(driver);
     expect(userInfo.getUserName()).toBe('Chris Cowan');
-    expect(userInfo.getAccountSwitcherContactList()).toEqual([{
-      name: 'Chris Cowan',
-      emailAddress: 'cowan@streak.com'
-    }, {
-      name: 'Jonny Ive',
-      emailAddress: 'streak.web.test.1@gmail.com'
-    }, {
-      name: 'Nikola Tesla',
-      emailAddress: 'tesla@streak.com'
-    }]);
+    expect(userInfo.getAccountSwitcherContactList()).toEqual([
+      { name: 'Chris Cowan', emailAddress: 'cowan@streak.com' },
+      { name: 'Jonny Ive', emailAddress: 'streak.web.test.1@gmail.com' },
+      { name: 'Nikola Tesla', emailAddress: 'tesla@streak.com' },
+    ]);
   });
+
   it('delegated signed in, plus two normal', async () => {
     slot.innerHTML = `
 <div class="gb_w gb_ha" aria-label="Account Information" aria-hidden="false" tabindex="0" img-loaded="1"><div class="gb_J"><div>This account is managed by <b>streak.com</b>.</div><a class="gb_x" href="http://www.google.com/support/accounts/bin/answer.py?answer=181692&amp;hl=en" target="_blank">Learn more</a></div><div class="identityUserDelegatedAccount gb_z"><div class="gb_D">tesla@streak.com</div></div><div class="gb_K" aria-hidden="false"><a class="gb_L" href="https://mail.google.com/mail/u/0" target="_blank" rel="noreferrer"><img class="gb_Q" src="https://plus.google.com/u/0/_/focus/g/143/photos/public/AIbEiAIAAABECLTFjZCok6-J9wEiC3ZjYXJkX3Bob3RvKihkZjczYTJjY2M2ZmEzNzg0OTk0NzdlM2JmYjg4OWY0ZTNmOTFhZmNiMAEiaDfw7v26ir1rp345NanqFU_MhQ?sz=48" alt="Google+ Profile Icon"><div class="gb_N"><div class="gb_R">Chris Cowan</div><div class="gb_S">cowan@streak.com (default)</div></div></a><a class="gb_L" href="https://mail.google.com/mail/u/1" target="_blank" rel="noreferrer"><img class="gb_Q" src="https://plus.google.com/u/0/_/focus/g/143/photos/public/AIbEiAIAAABDCL_nn8ag5pLBGCILdmNhcmRfcGhvdG8qKGJmZjExYmU4ODA5YjhlNDc5OTdmMzhmZDI0YWEyMmUxNTdmNTYzNTIwAbWsPITWijXgBmbaAWa7V0IlI8KH?sz=48" alt="Google+ Profile Icon"><div class="gb_N"><div class="gb_R">Jonny Ive</div><div class="gb_S">streak.web.test.1@gmail.com</div></div></a></div><a class="gb_T gb_c" href="https://plus.google.com/u/0/dashboard" aria-hidden="true"><span class="gb_U gb_2"></span><div class="gb_V">All your Google+ pages ›</div></a><div class="gb_F"><div><a class="gb_9b gb_a" href="https://accounts.google.com/AddSession?hl=en&amp;continue=https://mail.google.com/mail&amp;service=mail" target="_blank">Add account</a></div><div><a class="gb_cc gb_jc gb_a" id="gb_71" href="https://mail.google.com/mail/logout?hl=en" target="_top">Sign out</a></div></div></div>
 `;
-    const userInfo = new _userInfo.default(driver);
-    expect(userInfo.getAccountSwitcherContactList()).toEqual([{
-      name: 'Chris Cowan',
-      emailAddress: 'cowan@streak.com'
-    }, {
-      name: 'Jonny Ive',
-      emailAddress: 'streak.web.test.1@gmail.com'
-    }]);
+
+    const userInfo = new UserInfo(driver);
+    expect(userInfo.getAccountSwitcherContactList()).toEqual([
+      { name: 'Chris Cowan', emailAddress: 'cowan@streak.com' },
+      { name: 'Jonny Ive', emailAddress: 'streak.web.test.1@gmail.com' },
+    ]);
   });
 });
+
 describe('new', () => {
   it('normal signed in, plus one normal and one delegated', async () => {
     slot.innerHTML = `
 <div class="gb_va gb_1b" aria-label="Account Information" aria-hidden="false" tabindex="0" img-loaded="1"><div class="gb_Ia"><div>This account is managed by <b>streak.com</b>.</div><a class="gb_wa" href="http://www.google.com/support/accounts/bin/answer.py?answer=181692&amp;hl=en" target="_blank">Learn more</a></div><div class="gb_ya"><a class="gb_za gb_Pc" href="https://plus.google.com/u/0/me?tab=mX&amp;authuser=0" target="_blank"><div class="gb_ha gbip" title="Google+ Profile Icon"></div><span class="gb_Ba">Change photo</span></a><div class="gb_Aa"><div class="gb_Ca">Chris Cowan</div><div class="gb_Da">cowan@streak.com</div><div class="gb_xa"><a href="https://plus.google.com/u/0/me?tab=mX&amp;authuser=0" target="_blank">Profile</a>–<a href="http://www.google.com/intl/en/policies/privacy/" target="_blank">Privacy</a></div><a class="gb_Mc gbp1 gb_7" href="https://myaccount.google.com/?utm_source=OGB&amp;authuser=0" target="_blank">My Account</a></div></div><div class="gb_Ja" aria-hidden="false"><a class="gb_Ka gb_Na gb_Oa" target="_blank" rel="noreferrer"><img class="gb_Pa" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABECLTFjZCok6-J9wEiC3ZjYXJkX3Bob3RvKihkZjczYTJjY2M2ZmEzNzg0OTk0NzdlM2JmYjg4OWY0ZTNmOTFhZmNiMAEiaDfw7v26ir1rp345NanqFU_MhQ?sz=48" alt="Google+ Profile Icon"><div class="gb_Ma"><div class="gb_Qa">Chris Cowan</div><div class="gb_Ra">cowan@streak.com (default)</div></div></a><a class="gb_Ka" href="https://mail.google.com/mail/u/1" target="_blank" rel="noreferrer"><img class="gb_Pa" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABDCL_nn8ag5pLBGCILdmNhcmRfcGhvdG8qKGJmZjExYmU4ODA5YjhlNDc5OTdmMzhmZDI0YWEyMmUxNTdmNTYzNTIwAbWsPITWijXgBmbaAWa7V0IlI8KH?sz=48" alt="Google+ Profile Icon"><div class="gb_Ma"><div class="gb_Qa">Jonny Ive</div><div class="gb_Ra">streak.web.test.1@gmail.com</div></div></a><a class="gb_Ka" href="https://mail.google.com/mail/b/143/u/0/" target="_blank" rel="noreferrer"><img class="gb_Pa" src="https://plus.google.com/u/0/_/focus/photos/public/AIbEiAIAAABDCNqH_oPv4JWcMyILdmNhcmRfcGhvdG8qKDI5NjUxOGIyNzBjODJkZmI1Y2E1MDllNDU2YzlkNWNjMGMzYTBiNWMwATxsheQ8PeCbYGB49uDPpAo3nqCJ?sz=48" alt="Google+ Profile Icon"><div class="gb_Ma"><div class="gb_Qa">Nikola Tesla</div><div class="gb_Ra">tesla@streak.com (delegated)</div></div></a></div><a class="gb_Sa gb_ea" href="https://plus.google.com/u/0/dashboard" aria-hidden="true"><span class="gb_Ta gb_5a"></span><div class="gb_Ua">All your Google+ pages ›</div></a><div class="gb_Ea"><div><a class="gb_Kc gb_7" href="https://accounts.google.com/AddSession?hl=en&amp;continue=https://mail.google.com/mail&amp;service=mail" target="_blank">Add account</a></div><div><a class="gb_Nc gb_Uc gb_7" id="gb_71" href="https://mail.google.com/mail/logout?hl=en" target="_top">Sign out</a></div></div></div>
     `;
-    const userInfo = new _userInfo.default(driver);
+    const userInfo = new UserInfo(driver);
     expect(userInfo.getUserName()).toBe('Chris Cowan');
-    expect(userInfo.getAccountSwitcherContactList()).toEqual([{
-      name: 'Chris Cowan',
-      emailAddress: 'cowan@streak.com'
-    }, {
-      name: 'Jonny Ive',
-      emailAddress: 'streak.web.test.1@gmail.com'
-    }, {
-      name: 'Nikola Tesla',
-      emailAddress: 'tesla@streak.com'
-    }]);
+    expect(userInfo.getAccountSwitcherContactList()).toEqual([
+      { name: 'Chris Cowan', emailAddress: 'cowan@streak.com' },
+      { name: 'Jonny Ive', emailAddress: 'streak.web.test.1@gmail.com' },
+      { name: 'Nikola Tesla', emailAddress: 'tesla@streak.com' },
+    ]);
   });
+
   it('delegated signed in, plus two normal', async () => {
     slot.innerHTML = `
 <div class="gb_va gb_1b" aria-label="Account Information" aria-hidden="false" tabindex="0" img-loaded="1"><div class="gb_Ia"><div>This account is managed by <b>streak.com</b>.</div><a class="gb_wa" href="http://www.google.com/support/accounts/bin/answer.py?answer=181692&amp;hl=en" target="_blank">Learn more</a></div><div class="identityUserDelegatedAccount gb_ya"><div class="gb_Ca">tesla@streak.com</div></div><div class="gb_Ja" aria-hidden="false"><a class="gb_Ka" href="https://mail.google.com/mail/u/0" target="_blank" rel="noreferrer"><img class="gb_Pa" src="https://plus.google.com/u/0/_/focus/g/143/photos/public/AIbEiAIAAABECLTFjZCok6-J9wEiC3ZjYXJkX3Bob3RvKihkZjczYTJjY2M2ZmEzNzg0OTk0NzdlM2JmYjg4OWY0ZTNmOTFhZmNiMAEiaDfw7v26ir1rp345NanqFU_MhQ?sz=48" alt="Google+ Profile Icon"><div class="gb_Ma"><div class="gb_Qa">Chris Cowan</div><div class="gb_Ra">cowan@streak.com (default)</div></div></a><a class="gb_Ka" href="https://mail.google.com/mail/u/1" target="_blank" rel="noreferrer"><img class="gb_Pa" src="https://plus.google.com/u/0/_/focus/g/143/photos/public/AIbEiAIAAABDCL_nn8ag5pLBGCILdmNhcmRfcGhvdG8qKGJmZjExYmU4ODA5YjhlNDc5OTdmMzhmZDI0YWEyMmUxNTdmNTYzNTIwAbWsPITWijXgBmbaAWa7V0IlI8KH?sz=48" alt="Google+ Profile Icon"><div class="gb_Ma"><div class="gb_Qa">Jonny Ive</div><div class="gb_Ra">streak.web.test.1@gmail.com</div></div></a></div><a class="gb_Sa gb_ea" href="https://plus.google.com/u/0/dashboard" aria-hidden="true"><span class="gb_Ta gb_5a"></span><div class="gb_Ua">All your Google+ pages ›</div></a><div class="gb_Ea"><div><a class="gb_Kc gb_7" href="https://accounts.google.com/AddSession?hl=en&amp;continue=https://mail.google.com/mail&amp;service=mail" target="_blank">Add account</a></div><div><a class="gb_Nc gb_Uc gb_7" id="gb_71" href="https://mail.google.com/mail/logout?hl=en" target="_top">Sign out</a></div></div></div>
     `;
-    const userInfo = new _userInfo.default(driver);
-    expect(userInfo.getAccountSwitcherContactList()).toEqual([{
-      name: 'Chris Cowan',
-      emailAddress: 'cowan@streak.com'
-    }, {
-      name: 'Jonny Ive',
-      emailAddress: 'streak.web.test.1@gmail.com'
-    }]);
+
+    const userInfo = new UserInfo(driver);
+    expect(userInfo.getAccountSwitcherContactList()).toEqual([
+      { name: 'Chris Cowan', emailAddress: 'cowan@streak.com' },
+      { name: 'Jonny Ive', emailAddress: 'streak.web.test.1@gmail.com' },
+    ]);
   });
+
   it('single user', async () => {
     slot.innerHTML = `
 <div class="gb_va gb_1b" aria-label="Account Information" aria-hidden="false" tabindex="0" img-loaded="1"><div class="gb_ya"><div class="gb_Aa"><div class="gb_Ca">PeopleAggregate Test</div><div class="gb_Da">peopleaggregatetest@gmail.com</div><div class="gb_xa"><a href="https://plus.google.com/u/0/up/accounts/upgrade?gpsrc=ogjgp&amp;tab=mX" target="_blank">Join Google+</a>–<a href="http://www.google.com/intl/en/policies/privacy/" target="_blank">Privacy</a></div><a class="gb_Mc gbp1 gb_7" href="https://myaccount.google.com/?utm_source=OGB" target="_blank">My Account</a></div></div><div class="gb_Ja gb_ea" aria-hidden="true"></div><a class="gb_Sa gb_ea" href="https://plus.google.com/u/0/dashboard" aria-hidden="true"><span class="gb_Ta gb_5a"></span><div class="gb_Ua">All your Google+ pages ›</div></a><div class="gb_Ea"><div><a class="gb_Kc gb_7" href="https://accounts.google.com/AddSession?hl=en&amp;continue=https://mail.google.com/mail&amp;service=mail" target="_blank">Add account</a></div><div><a class="gb_Nc gb_Uc gb_7" id="gb_71" href="https://mail.google.com/mail/logout?hl=en" target="_top">Sign out</a></div></div></div>
     `;
-    const userInfo = new _userInfo.default(driver);
-    expect(userInfo.getAccountSwitcherContactList()).toEqual([{
-      name: 'PeopleAggregate Test',
-      emailAddress: 'peopleaggregatetest@gmail.com'
-    }]);
+
+    const userInfo = new UserInfo(driver);
+    expect(userInfo.getAccountSwitcherContactList()).toEqual([
+      {
+        name: 'PeopleAggregate Test',
+        emailAddress: 'peopleaggregatetest@gmail.com',
+      },
+    ]);
   });
-});
+});

package/src/platform-implementation-js/dom-driver/gmail/gmail-driver.d.ts

@@ -15,10 +15,7 @@ import { Contact } from '../../driver-interfaces/compose-view-driver';
 import GmailSupportItemView, {
   SupportItemDescriptor,
 } from './views/gmail-support-item-view';
-import { AppMenuItemDescriptor } from '../../namespaces/app-menu';
-import { GmailAppMenuItemView } from './views/gmail-app-menu-item-view';
-import { RouteView } from '../../../inboxsdk';
-
+type GmailRouteView = any;
 type GmailThreadView = any;
 type GmailMessageView = any;
 type GmailAttachmentCardView = any;
@@ -33,7 +30,7 @@ export default class GmailDriver implements Driver {
   public getLogger(): Logger;
   public getAppId(): string;
   public getOpts(): PiOpts;
-  public getRouteViewDriverStream(): Kefir.Observable<RouteView, any>; // should be a property
+  public getRouteViewDriverStream(): Kefir.Observable<GmailRouteView, any>; // should be a property
   public getRowListViewDriverStream(): Kefir.Observable<any, any>;
   public openNewComposeViewDriver(): Promise<GmailComposeView>;
   public getNextComposeViewDriver(): Promise<GmailComposeView>;
@@ -63,14 +60,7 @@ export default class GmailDriver implements Driver {
     any
   >;
   public registerThreadButton(options: any): () => void;
-  public addNavItem(
-    appId: string,
-    navItemDescriptor: any,
-    navMenuInjectionContainer?: HTMLElement
-  ): any;
-  addAppMenuItem(
-    menuItemDescriptor: AppMenuItemDescriptor
-  ): Promise<GmailAppMenuItemView>;
+  public addNavItem(appId: string, navItemDescriptor: any): any;
   public addSupportItem(
     supportItemDescriptor: SupportItemDescriptor
   ): GmailSupportItemView;