Skip to content

Commit a4fc1a3

Browse files
authored
ENGCOM-6517: Textarea patch 1 #26142
2 parents ea6b7f4 + 0d2ef6e commit a4fc1a3

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1 id="modal-title-<%- data.id %>" class="modal-title"
2727

2828
<% if(data.subTitle){ %>
2929
<span class="modal-subtitle"
30-
data-role="subtitle">
30+
data-role="subTitle">
3131
<%= data.subTitle %>
3232
</span>
3333
<% } %>

app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1 id="modal-title-<%- data.id %>" class="modal-title"
2727

2828
<% if(data.subTitle){ %>
2929
<span class="modal-subtitle"
30-
data-role="subtitle">
30+
data-role="subTitle">
3131
<%= data.subTitle %>
3232
</span>
3333
<% } %>

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,45 @@ define([
1010
'use strict';
1111

1212
describe('ui/js/modal/modal', function () {
13-
var element = $('<div>some element</div>'),
13+
14+
var element,
15+
modal;
16+
17+
beforeEach(function () {
18+
element = $('<div id="element">Element</div>');
1419
modal = element.modal({}).data('mage-modal');
1520

21+
$(element).append('<h1 class="modal-title"' +
22+
' data-role="title">Title</h1>' +
23+
'<span class="modal-subtitle"' +
24+
' data-role="subTitle"></span>');
25+
});
26+
27+
afterEach(function () {
28+
$('.modal-title').remove();
29+
$('#element').remove();
30+
31+
});
32+
1633
it('Check for modal definition', function () {
1734
expect(modal).toBeDefined();
1835
});
36+
1937
it('Show/hide function check', function () {
2038
expect(element.trigger('openModal')).toBe(element);
2139
expect(element.trigger('closeModal')).toBe(element);
2240
});
41+
2342
it('Integration: modal created on page', function () {
2443
expect($(modal).length).toEqual(1);
2544
});
45+
46+
it('Verify set title', function () {
47+
var newTitle = 'New modal title';
48+
49+
modal.setTitle(newTitle);
50+
expect($(modal.options.modalTitle).text()).toContain(newTitle);
51+
expect($(modal.options.modalTitle).find(modal.options.modalSubTitle).length).toBe(1);
52+
});
2653
});
2754
});

0 commit comments

Comments
 (0)