Skip to content

Commit b5550cc

Browse files
committed
#1684: Login failed error contains HTML tags - fix static tests and added jasmine tests
1 parent deb001c commit b5550cc

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define([
8282
* @param {String} message
8383
* @return {String}
8484
*/
85-
prepareMessageForHtml: function (message) {
85+
prepareMessageUnsanitizedHtml: function (message) {
8686
return escaper.escapeHtml(message, this.allowedTags);
8787
}
8888
});

app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="messages" outereach="messages">
99
<div attr="class: 'message message-'+code">
1010
<div data-ui-id="messages-message-error">
11-
<span data-bind="html: $parent.prepareMessageForHtml(message)"></span>
11+
<span data-bind="html: $parent.prepareMessageUnsanitizedHtml(message)"></span>
1212
</div>
1313
</div>
1414
</div>
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'Magento_MediaGalleryUi/js/grid/messages',
8+
], function (Messages) {
9+
'use strict';
10+
11+
describe('Magento_MediaGalleryUi/grid/messages', function () {
12+
var message,
13+
messageText,
14+
errorType,
15+
successType;
16+
17+
beforeEach(function () {
18+
message = Messages;
19+
messageText = 'test message';
20+
errorType = 'error';
21+
successType = 'success';
22+
});
23+
24+
describe('message handling', function () {
25+
it('add error message, get error message', function () {
26+
message.add(errorType, messageText);
27+
expect(message.get()).toEqual([messageText]);
28+
});
29+
30+
it('add success message, get success message', function () {
31+
message.add(successType, messageText);
32+
expect(message.get()).toEqual([messageText]);
33+
});
34+
35+
it('scheduled cleaning messages', function () {
36+
message.add(errorType, messageText);
37+
message.scheduleCleanup();
38+
expect(message.get()).toEqual([]);
39+
});
40+
});
41+
42+
describe('prepareMessageUnsanitizedHtml', function () {
43+
var messageData,
44+
expectedData;
45+
46+
beforeEach(function () {
47+
messageData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
48+
expectedData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
49+
});
50+
51+
it('prepare message to be rendered as HTML', function () {
52+
expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
53+
});
54+
});
55+
});
56+
});

0 commit comments

Comments
 (0)