Merge lp:~justinmcp/unity-webapps-gmail/bug-1069576 into lp:unity-webapps-gmail

[Justin McPherson]

The test for a Gmail or mail title was removed.

- The text is not always exactly equal to this.
- When this function is called, its already determined that this page is Gmail.

[Alexandre Abreu (abreu-alexandre)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'GMail.user.js'
--- GMail.user.js	2013-06-18 04:58:58 +0000
+++ GMail.user.js	2013-09-24 07:47:29 +0000
@@ -29,7 +29,7 @@
 function getLabels() {
     var i, res = [];
 
-    var snapshot = document.evaluate('//div[@role="navigation"]/div[2]/div/div/div[7]/div/*/div/div/div[2]/span/a',
+    var snapshot = document.evaluate('//div[@role="navigation"]/div[2]//a[contains(@href, "#label")]',
                                      document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
 
     for (i = 0; i < snapshot.snapshotLength; i++) {
@@ -44,15 +44,10 @@
 }
 
 function checkMessagesCount() {
-    var tag = document.evaluate('//div/div[2]/div/div/div/div/div[@role="button"]/span', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
-
-    if (tag.textContent !== 'Gmail' && tag.textContent !== 'Mail') {
-        throw new Error();
-    }
 
     var indicators = [];
 
-    var inboxLink = document.evaluate('//div[@role="navigation"]/div/div/div/div/div/div/div/div/div/span/a', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
+    var inboxLink = document.evaluate('//div[@role="navigation"]/div[2]//a[contains(@href, "#inbox")]', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
 
     if (!inboxLink || !inboxLink.href || !inboxLink.text) {
         return indicators;