Bug 1024578 - Attachment notification no longer collapses duplicate keywords. r=Standard8

mail/base/modules/attachmentChecker.js

@@ -64,8 +64,10 @@ function GetAttachmentKeywords(mailData,keywordsInCsv)
       if (matching) {
         for (var j = 0; j < matching.length; j++) {
           // Ignore the match if it was in a URL.
-          if (!(/^(https?|ftp):\/\//i.test(matching[j])))
+          if (!(/^(https?|ftp):\/\//i.test(matching[j]))) {
             keywordsFound.push(matching[j].trim());
+            break;
+          }
         }
       }
     }
@@ -76,8 +78,10 @@ function GetAttachmentKeywords(mailData,keywordsInCsv)
       var matching;
       while ((matching = re.exec(mailData)) !== null) {
         // Ignore the match if it was in a URL.
-        if (!(/^(https?|ftp):\/\//i.test(matching[0].trim())))
+        if (!(/^(https?|ftp):\/\//i.test(matching[0].trim()))) {
           keywordsFound.push(keywordsArray[i]);
+          break;
+        }
       }
     }
   }

mail/test/mozmill/composition/test-attachment-reminder.js

@@ -6,6 +6,8 @@
  * Tests that the attachment reminder works properly.
  */
 
+// make SOLO_TEST=composition/test-attachment-reminder.js mozmill-one
+
 const MODULE_NAME = "test-attachment-reminder";
 
 const RELATIVE_ROOT = "../shared-modules";
@@ -203,7 +205,8 @@ function test_attachment_reminder_with_attachment() {
 
   // Add some more text with keyword so the automatic notification
   // could potentially show up.
-  setupComposeWin(cwc, "", "", " Yes, there is a file attached!");
+  setupComposeWin(cwc, "", "", " Yes, there is a file test.doc attached! " + 
+                  "Do check it, test.doc is a nice attachment.");
   // Give the notification time to appear. It shouldn't.
   wait_for_reminder_state(cwc, false);
 
@@ -212,7 +215,7 @@ function test_attachment_reminder_with_attachment() {
   // After removing the attachment, notification should come back
   // with all the keywords, even those input while having an attachment.
   wait_for_reminder_state(cwc, true);
-  assert_equals(get_reminder_keywords(cwc), "attachment, attached");
+  assert_equals(get_reminder_keywords(cwc), "test.doc, attachment, attached");
 
   close_compose_window(cwc);
 }