#202 fix identification if mail is in trash

3 files changed, 23 insertions, 3 deletions

diff --git a/web-ui/app/js/services/model/mail.js b/web-ui/app/js/services/model/mail.js
index 870c6a80..2c5fa0dd 100644
--- a/web-ui/app/js/services/model/mail.js
+++ b/web-ui/app/js/services/model/mail.js
@@ -31,7 +31,7 @@ define(['helpers/contenttype'],
     }
 
     function isInTrash() {
-      return _.contains(this.tags, 'trash');
+      return this.mailbox.toLowerCase() === 'trash';
     }
 
     function setDraftReplyFor(ident) {
diff --git a/web-ui/test/spec/services/model/mail.spec.js b/web-ui/test/spec/services/model/mail.spec.js
index 53ac0845..35c4bc9b 100644
--- a/web-ui/test/spec/services/model/mail.spec.js
+++ b/web-ui/test/spec/services/model/mail.spec.js
@@ -6,10 +6,11 @@ require(['services/model/mail'], function (Mail) {
   describe('services/model/mail', function () {
     describe('parsing', function () {
       describe('a single email', function () {
-        var sentMail, draftMail, receivedMail, receivedMailWithCC, rawMailWithMultipleTo;
+        var sentMail, draftMail, receivedMail, receivedMailWithCC, rawMailWithMultipleTo, mailInTrash;
         beforeEach(function () {
           sentMail = Mail.create(Pixelated.testData().rawMail.sent);
           draftMail = Mail.create(Pixelated.testData().rawMail.draft);
+          mailInTrash = Mail.create(Pixelated.testData().rawMail.trash);
           receivedMail = Mail.create(Pixelated.testData().rawMail.received);
           receivedMailWithCC = Mail.create(Pixelated.testData().rawMail.receivedWithCC);
           rawMailWithMultipleTo = Mail.create(Pixelated.testData().rawMail.rawMailWithMultipleTo);
@@ -27,6 +28,10 @@ require(['services/model/mail'], function (Mail) {
           expect(receivedMail.isSentMail()).toBe(false);
           expect(receivedMail.isDraftMail()).toBe(false);
         });
+
+        it('correctly identifies a mail in trash', function () {
+          expect(mailInTrash.isInTrash()).toBe(true);
+        });
       });
 
       describe('multipart email', function () {
diff --git a/web-ui/test/test_data.js b/web-ui/test/test_data.js
index f83a807c..20b6ee0f 100644
--- a/web-ui/test/test_data.js
+++ b/web-ui/test/test_data.js
@@ -40,7 +40,6 @@ define(function() {
         'cc-field': ['duda@la.lu']
       }
     }
-
   };
 
   var rawDraftMail = {
@@ -57,7 +56,22 @@ define(function() {
         'cc-field': []
       }
     }
+  };
 
+  var rawMailInTrash = {
+    'header':{'to':'mariane_dach@davis.info','from':'afton_braun@botsford.biz','subject':'Consectetur sit omnis veniam blanditiis.','date':'2014-06-17T11:56:53-03:00'},
+    'ident':9360,
+    'tags':['photography','sky'],
+    'status':['read'],
+    'body':'Illum eos nihil commodi voluptas. Velit consequatur odio quibusdam. Beatae aliquam hic quos.',
+    'mailbox': 'TRASH',
+    replying: {
+      single: 'afton_braun@botsford.biz',
+      all: {
+        'to-field': ['afton_braun@botsford.biz'],
+        'cc-field': []
+      }
+    }
   };
 
   var rawReceivedMail = {
@@ -219,6 +233,7 @@ define(function() {
       mail: rawMail,
       sent: rawSentMail,
       draft: rawDraftMail,
+      trash: rawMailInTrash,
       received: rawReceivedMail,
       receivedWithCC: rawReceivedWithCCMail,
       rawMailWithMultipleTo: rawMailWithMultipleTo,