summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web-ui/app/js/helpers/monitored_ajax.js6
-rw-r--r--web-ui/test/spec/mail_list_actions/ui/mail_list_actions.spec.js4
2 files changed, 5 insertions, 5 deletions
diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js
index 3dfec34a..061806fc 100644
--- a/web-ui/app/js/helpers/monitored_ajax.js
+++ b/web-ui/app/js/helpers/monitored_ajax.js
@@ -20,9 +20,9 @@ define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n,
'use strict';
var messages = {
- timeout: i18n('error.timeout'),
- error: i18n('error.general'),
- parseerror: i18n('error.parse')
+ timeout: 'error.timeout',
+ error: 'error.general',
+ parseerror: 'error.parse'
};
function monitoredAjax(on, url, config) {
diff --git a/web-ui/test/spec/mail_list_actions/ui/mail_list_actions.spec.js b/web-ui/test/spec/mail_list_actions/ui/mail_list_actions.spec.js
index d8917ed9..a12ca98a 100644
--- a/web-ui/test/spec/mail_list_actions/ui/mail_list_actions.spec.js
+++ b/web-ui/test/spec/mail_list_actions/ui/mail_list_actions.spec.js
@@ -17,7 +17,7 @@ describeComponent('mail_list_actions/ui/mail_list_actions', function () {
it('should render button text delete permanently if tag trash', function () {
$(document).trigger(Pixelated.events.ui.tag.select, {tag: 'trash'});
- expect(this.component.$node.html()).toMatch('<li><input type="button" id="delete-selected" value="Delete permanently" disabled="disabled"></li>');
+ expect(this.component.$node.html()).toMatch('<li><input type="button" id="delete-selected" value="Delete Permanently" disabled="disabled"></li>');
});
it('should render button delete permanently if url contains trash tag', function () {
@@ -26,7 +26,7 @@ describeComponent('mail_list_actions/ui/mail_list_actions', function () {
this.setupComponent();
- expect(this.component.$node.html()).toMatch('<li><input type="button" id="delete-selected" value="Delete permanently" disabled="disabled"></li>');
+ expect(this.component.$node.html()).toMatch('<li><input type="button" id="delete-selected" value="Delete Permanently" disabled="disabled"></li>');
});
it('should render move to inbox if on trash', function () {