Issue #649: Refactor Tags

2 files changed, 3 insertions, 4 deletions

diff --git a/web-ui/test/custom_matchers.js b/web-ui/test/custom_matchers.js
index b1e06d1f..d68d21a8 100644
--- a/web-ui/test/custom_matchers.js
+++ b/web-ui/test/custom_matchers.js
@@ -5,8 +5,8 @@ define([], function() {
       compare: function (mail, node) {
         var result = {}, equals = {}, subject, tags, from, date, messages = [], notMessages = [];
 
-        subject = node.find('#mail-' + mail.ident + ' .subject-and-tags')[0];
-        tags = _.map(node.find('#mail-' + mail.ident + ' .subject-and-tags .tag'), function (tag) { return tag.textContent; });
+        subject = node.find('#mail-' + mail.ident + ' .subject')[0];
+        tags = _.map(node.find('#mail-' + mail.ident + ' .tags .tags-tag'), function (tag) { return tag.textContent; });
         date = node.find('#mail-' + mail.ident + ' .received-date');
         from = node.find('#mail-' + mail.ident + ' .from');
 
diff --git a/web-ui/test/spec/mail_view/ui/mail_view.spec.js b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
index 29be6c2d..093eddb8 100644
--- a/web-ui/test/spec/mail_view/ui/mail_view.spec.js
+++ b/web-ui/test/spec/mail_view/ui/mail_view.spec.js
@@ -58,9 +58,8 @@ describeComponent('mail_view/ui/mail_view', function () {
     testData.mail.tags = ['tag', 'other'];
     this.component.displayMail({}, testData);
 
-    var inboxTag = this.component.$node.find('.tag[data-tag="tag"]');
+    var inboxTag = this.component.$node.find('.mail-read-view__header-tags-tag[data-tag="tag"]');
     inboxTag.html('<em class="search-highlight">' + inboxTag.text() + '</em>');
-
     this.component.$node.find('.search-highlight').click();
 
     expect(updateSpy).toHaveBeenTriggeredOn(document);