summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-03-06 16:58:00 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-03-06 16:58:09 -0300
commitbc3225efb7e21e413dd70eec7f6428e8447abfe7 (patch)
treec7a8cd42ad1fc8c80f17eb14cff978e493acc83b
parent2766e29a946708cb9325b7228a84529daa604eca (diff)
for #288, changes current failure message to error
-rw-r--r--web-ui/app/js/mail_view/ui/mail_view.js2
-rw-r--r--web-ui/test/spec/mail_view/ui/mail_view.spec.js2
2 files changed, 2 insertions, 2 deletions
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() {