From d510e3ba01bfd69578f824e61d0760555fd8cd1d Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 12 Nov 2014 11:56:01 +0100 Subject: Fixing functional test failure on 'trash/delete this message' step. Adding attachment icon to mail list --- service/test/functional/features/steps/mail_view.py | 2 +- web-ui/app/templates/mails/single.hbs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py index a7586931..0c37d089 100644 --- a/service/test/functional/features/steps/mail_view.py +++ b/service/test/functional/features/steps/mail_view.py @@ -95,7 +95,7 @@ def impl(context): @then('I choose to trash') def impl(context): context.browser.execute_script("$('button#view-more-actions').click()") - click_button(context, 'Trash this message', 'span') + click_button(context, 'Delete this message', 'span') @then('I see the mail has a cc and a bcc recipient') diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs index baf6251c..32ddb869 100644 --- a/web-ui/app/templates/mails/single.hbs +++ b/web-ui/app/templates/mails/single.hbs @@ -3,7 +3,9 @@ - {{ header.formattedDate }} + {{ header.formattedDate }} +
+
{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}
-- cgit v1.2.3