Skip to content

Commit 811c4ad

Browse files
committed
#29398: Fixed jasmine test
1 parent 2d0bbad commit 811c4ad

File tree

1 file changed

+49
-27
lines changed
  • dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid

1 file changed

+49
-27
lines changed

dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,75 @@
44
*/
55

66
define([
7-
'Magento_MediaGalleryUi/js/grid/messages'
8-
], function (Messages) {
7+
'Magento_MediaGalleryUi/js/grid/messages',
8+
'escaper'
9+
], function (Messages, Escaper) {
910
'use strict';
1011

1112
describe('Magento_MediaGalleryUi/js/grid/messages', function () {
12-
var message,
13+
var messagesInstance,
14+
escaperInstance,
1315
messageText,
1416
errorType,
1517
successType;
1618

1719
beforeEach(function () {
18-
message = Messages;
20+
escaperInstance = Escaper;
21+
messagesInstance = Messages({
22+
escaper: escaperInstance
23+
});
1924
messageText = 'test message';
2025
errorType = 'error';
2126
successType = 'success';
2227
});
2328

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+
it('add error message, get error message', function () {
30+
messagesInstance.add(errorType, messageText);
31+
expect(messagesInstance.get()).toEqual([{
32+
code: errorType,
33+
message: messageText
34+
}]);
35+
});
2936

30-
it('add success message, get success message', function () {
31-
message.add(successType, messageText);
32-
expect(message.get()).toEqual([messageText]);
33-
});
37+
it('add success message, get success message', function () {
38+
messagesInstance.add(successType, messageText);
39+
expect(messagesInstance.get()).toEqual([{
40+
code: successType,
41+
message: messageText
42+
}]);
43+
});
3444

35-
it('scheduled cleaning messages', function () {
36-
message.add(errorType, messageText);
37-
message.scheduleCleanup();
38-
expect(message.get()).toEqual([]);
39-
});
45+
it('handles multiple messages', function () {
46+
messagesInstance.add(successType, messageText);
47+
messagesInstance.add(errorType, messageText);
48+
expect(messagesInstance.get()).toEqual([
49+
{
50+
code: successType,
51+
message: messageText
52+
},
53+
{
54+
code: errorType,
55+
message: messageText
56+
}
57+
]);
4058
});
4159

42-
describe('prepareMessageUnsanitizedHtml', function () {
43-
var messageData,
44-
expectedData;
60+
it('cleans messages', function () {
61+
messagesInstance.add(errorType, messageText);
62+
messagesInstance.clear();
4563

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-
});
64+
expect(messagesInstance.get()).toEqual([]);
65+
});
5066

51-
it('prepare message to be rendered as HTML', function () {
52-
expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
67+
it('prepare message to be rendered as HTML', function () {
68+
var escapedMessage = 'escaped message';
69+
70+
// eslint-disable-next-line max-nested-callbacks
71+
spyOn(escaperInstance, 'escapeHtml').and.callFake(function () {
72+
return escapedMessage;
5373
});
74+
75+
expect(messagesInstance.prepareMessageUnsanitizedHtml(messageText)).toEqual(escapedMessage);
5476
});
5577
});
5678
});

0 commit comments

Comments
 (0)