From bc3225efb7e21e413dd70eec7f6428e8447abfe7 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 6 Mar 2015 16:58:00 -0300 Subject: for #288, changes current failure message to error --- web-ui/app/js/mail_view/ui/mail_view.js | 2 +- web-ui/test/spec/mail_view/ui/mail_view.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'web-ui') diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js index 4faba468..578dcbb9 100644 --- a/web-ui/app/js/mail_view/ui/mail_view.js +++ b/web-ui/app/js/mail_view/ui/mail_view.js @@ -108,7 +108,7 @@ define( var status = ['encrypted']; if(_.any(mail.security_casing.locks, function (lock) { return lock.state === 'valid'; })) { status.push('encryption-valid'); } - else { status.push('encryption-failure'); } + else { status.push('encryption-error'); } return status.join(' '); }; 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 86b40591..deb7fb88 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 @@ -117,7 +117,7 @@ describeComponent('mail_view/ui/mail_view', function () { it('assumes that the mail is encrypted and failure if all the locks are failed', function() { var email = testData; email.security_casing = {locks: [{state: 'failure'}, {state: 'failure'}]}; - expect(this.component.checkEncrypted(email)).toEqual('encrypted encryption-failure'); + expect(this.component.checkEncrypted(email)).toEqual('encrypted encryption-error'); }); it('assumes that the mail is not encrypted if it doesn\'t have any locks', function() { -- cgit v1.2.3