From 626aae40b9407a1b044c33784dfd42dff784ad9c Mon Sep 17 00:00:00 2001 From: Felix Hammerl Date: Mon, 21 Mar 2016 12:09:54 +0100 Subject: Issue #649: Refactor Tags --- web-ui/test/custom_matchers.js | 4 ++-- web-ui/test/spec/mail_view/ui/mail_view.spec.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'web-ui/test') 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('' + inboxTag.text() + ''); - this.component.$node.find('.search-highlight').click(); expect(updateSpy).toHaveBeenTriggeredOn(document); -- cgit v1.2.3