Skip to content

Commit a667b63

Browse files
omiroshnichenkoomiroshnichenko
committed
#12342: JSTestDriver removal
- Added validation.test.js and removed JsTestDriver equivalent. - Fix unstable tests.
1 parent e510801 commit a667b63

File tree

8 files changed

+978
-735
lines changed

8 files changed

+978
-735
lines changed

‎dev/tests/js/JsTestDriver/testsuite/mage/validation/index.html‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎dev/tests/js/JsTestDriver/testsuite/mage/validation/test-validation.js‎

Lines changed: 0 additions & 611 deletions
This file was deleted.

‎dev/tests/js/jasmine/tests/lib/mage/backend/suggest.test.js‎

Lines changed: 79 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,30 @@ define([
1717
var $suggest = $('<input name="test-suggest" id="suggest" />');
1818

1919
$('body').append($suggest);
20+
$('body').append('<script type="text/template" id="test-template">' +
21+
'<div><%= data.test %></div>' +
22+
'</script>');
2023
});
2124

2225
afterEach(function () {
2326
$(suggestSelector).remove();
27+
$('#test-template').remove();
2428
$(suggestSelector).suggest('destroy');
2529
});
2630

2731
it('Check that suggest inited', function () {
28-
var $suggest = $(suggestSelector).suggest();
32+
var $suggest = $(suggestSelector).suggest({
33+
template: '#test-template',
34+
choiceTemplate: '<li/>'
35+
});
2936

3037
expect($suggest.is(':mage-suggest')).toBe(true);
3138
});
3239

3340
it('Check suggest create', function () {
3441
var options = {
42+
template: '#test-template',
43+
choiceTemplate: '<li/>',
3544
controls: {
3645
selector: '.test',
3746
eventsMap: {
@@ -80,6 +89,8 @@ define([
8089

8190
it('Check suggest render', function () {
8291
var options = {
92+
template: '#test-template',
93+
choiceTemplate: '<li/>',
8394
dropdownWrapper: '<div class="wrapper-test"></div>',
8495
className: 'test-suggest',
8596
inputWrapper: '<div class="test-input-wrapper"></div>'
@@ -108,15 +119,20 @@ define([
108119
});
109120

110121
it('Check suggest createValueField', function () {
111-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
122+
var suggestInstance = $(suggestSelector).suggest({
123+
template: '#test-template',
124+
choiceTemplate: '<li/>'
125+
}).data('mage-suggest'),
112126
valueField = suggestInstance._createValueField();
113127

114128
expect(valueField.is('input')).toBe(true);
115129
expect(valueField.is(':hidden')).toBe(true);
116130

117131
$(suggestSelector).suggest('destroy');
118132
suggestInstance = $(suggestSelector).suggest({
119-
multiselect: true
133+
multiselect: true,
134+
template: '#test-template',
135+
choiceTemplate: '<li/>'
120136
}).data('mage-suggest');
121137
valueField = suggestInstance._createValueField();
122138

@@ -126,7 +142,10 @@ define([
126142
});
127143

128144
it('Check suggest prepareValueField', function () {
129-
var $suggest = $(suggestSelector).suggest(),
145+
var $suggest = $(suggestSelector).suggest({
146+
template: '#test-template',
147+
choiceTemplate: '<li/>'
148+
}),
130149
suggestInstance = $suggest.data('mage-suggest'),
131150
suggestName = $suggest.attr('name');
132151

@@ -140,6 +159,8 @@ define([
140159

141160
it('Check suggest destroy', function () {
142161
var options = {
162+
template: '#test-template',
163+
choiceTemplate: '<li/>',
143164
inputWrapper: '<div class="test-input-wrapper"></div>',
144165
valueField: null
145166
},
@@ -167,8 +188,14 @@ define([
167188
$(suggestSelector).val(value);
168189
$('body').append('<div id="suggest-div">' + value + '</div>');
169190

170-
suggestInstance = $(suggestSelector).suggest().data('mage-suggest');
171-
suggestDivInstance = $('#suggest-div').suggest().data('mage-suggest');
191+
suggestInstance = $(suggestSelector).suggest({
192+
template: '#test-template',
193+
choiceTemplate: '<li/>'
194+
}).data('mage-suggest');
195+
suggestDivInstance = $('#suggest-div').suggest({
196+
template: '#test-template',
197+
choiceTemplate: '<li/>'
198+
}).data('mage-suggest');
172199

173200
expect(suggestInstance._value()).toBe(value);
174201
expect(suggestDivInstance._value()).toBe(value);
@@ -178,6 +205,8 @@ define([
178205
it('Check suggest bind', function () {
179206
var eventIsBinded = false,
180207
options = {
208+
template: '#test-template',
209+
choiceTemplate: '<li/>',
181210
events: {
182211
/** Stub function */
183212
click: function () {
@@ -192,7 +221,10 @@ define([
192221
});
193222

194223
it('Check suggest focus/blur', function () {
195-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
224+
var suggestInstance = $(suggestSelector).suggest({
225+
template: '#test-template',
226+
choiceTemplate: '<li/>'
227+
}).data('mage-suggest'),
196228
uiHash = {
197229
item: {
198230
id: 1,
@@ -215,7 +247,10 @@ define([
215247
});
216248

217249
it('Check suggest select', function () {
218-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
250+
var suggestInstance = $(suggestSelector).suggest({
251+
template: '#test-template',
252+
choiceTemplate: '<li/>'
253+
}).data('mage-suggest'),
219254
uiHash = {
220255
item: {
221256
id: 1,
@@ -243,6 +278,8 @@ define([
243278

244279
it('Check suggest multiselect', function () {
245280
var suggestInstance = $(suggestSelector).suggest({
281+
template: '#test-template',
282+
choiceTemplate: '<li/>',
246283
multiselect: true
247284
}).data('mage-suggest'),
248285
uiHash = {
@@ -282,7 +319,10 @@ define([
282319
});
283320

284321
it('Check suggest reset value', function () {
285-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest');
322+
var suggestInstance = $(suggestSelector).suggest({
323+
template: '#test-template',
324+
choiceTemplate: '<li/>'
325+
}).data('mage-suggest');
286326

287327
suggestInstance.valueField.val('test');
288328
expect(suggestInstance.valueField.val()).toBe('test');
@@ -292,6 +332,8 @@ define([
292332

293333
it('Check suggest reset multiselect value', function () {
294334
var suggestInstance = $(suggestSelector).suggest({
335+
template: '#test-template',
336+
choiceTemplate: '<li/>',
295337
multiselect: true
296338
}).data('mage-suggest'),
297339
uiHash = {
@@ -314,7 +356,10 @@ define([
314356
});
315357

316358
it('Check suggest read item data', function () {
317-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
359+
var suggestInstance = $(suggestSelector).suggest({
360+
template: '#test-template',
361+
choiceTemplate: '<li/>'
362+
}).data('mage-suggest'),
318363
testElement = $('<div/>');
319364

320365
expect(suggestInstance._readItemData(testElement)).toEqual(suggestInstance._nonSelectedItem);
@@ -324,7 +369,8 @@ define([
324369

325370
it('Check suggest template', function () {
326371
var suggestInstance = $(suggestSelector).suggest({
327-
template: '<div><%= data.test %></div>'
372+
template: '<div><%= data.test %></div>',
373+
choiceTemplate: '<li/>'
328374
}).data('mage-suggest'),
329375
tmpl = suggestInstance.templates[suggestInstance.templateName],
330376
html = $('<div/>').append(tmpl({
@@ -340,7 +386,8 @@ define([
340386
'</script>');
341387

342388
suggestInstance = $(suggestSelector).suggest({
343-
template: '#test-template'
389+
template: '#test-template',
390+
choiceTemplate: '<li/>'
344391
}).data('mage-suggest');
345392
tmpl = suggestInstance.templates[suggestInstance.templateName];
346393
html = $('<div />').append(tmpl({
@@ -354,7 +401,10 @@ define([
354401
});
355402

356403
it('Check suggest dropdown visibility', function () {
357-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest');
404+
var suggestInstance = $(suggestSelector).suggest({
405+
template: '#test-template',
406+
choiceTemplate: '<li/>'
407+
}).data('mage-suggest');
358408

359409
suggestInstance.dropdown.hide();
360410
expect(suggestInstance.isDropdownShown()).toBe(false);
@@ -366,7 +416,10 @@ define([
366416
});
367417

368418
it('Check suggest create option', function () {
369-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
419+
var suggestInstance = $(suggestSelector).suggest({
420+
template: '#test-template',
421+
choiceTemplate: '<li/>'
422+
}).data('mage-suggest'),
370423
uiHash = {
371424
item: {
372425
id: 1,
@@ -382,7 +435,10 @@ define([
382435
});
383436

384437
it('Check suggest add option', function () {
385-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
438+
var suggestInstance = $(suggestSelector).suggest({
439+
template: '#test-template',
440+
choiceTemplate: '<li/>'
441+
}).data('mage-suggest'),
386442
uiHash = {
387443
item: {
388444
id: 1,
@@ -402,7 +458,10 @@ define([
402458
});
403459

404460
it('Check suggest get option', function () {
405-
var suggestInstance = $(suggestSelector).suggest().data('mage-suggest'),
461+
var suggestInstance = $(suggestSelector).suggest({
462+
template: '#test-template',
463+
choiceTemplate: '<li/>'
464+
}).data('mage-suggest'),
406465
uiHash = {
407466
item: {
408467
id: 1,
@@ -420,6 +479,8 @@ define([
420479

421480
it('Check suggest last added', function () {
422481
var suggestInstance = $(suggestSelector).suggest({
482+
template: '#test-template',
483+
choiceTemplate: '<li/>',
423484
multiselect: true
424485
}).data('mage-suggest'),
425486
uiHash = {
@@ -437,6 +498,8 @@ define([
437498

438499
it('Check suggest remove option', function () {
439500
var suggestInstance = $(suggestSelector).suggest({
501+
template: '#test-template',
502+
choiceTemplate: '<li/>',
440503
multiselect: true
441504
}).data('mage-suggest'),
442505
uiHash = {

‎dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js‎

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ define([
2121

2222
group.collapsible('destroy');
2323
expect(group.is(':mage-collapsible')).toBeFalsy();
24+
group.remove();
2425
});
2526

2627
describe('Test enable, disable, activate and deactivate methods', function () {
@@ -87,6 +88,7 @@ define([
8788

8889
group.collapsible('destroy');
8990
expect(group.is(':mage-collapsible')).toBeFalsy();
91+
group.remove();
9092
});
9193

9294
it('check state classes', function () {
@@ -113,6 +115,7 @@ define([
113115

114116
group.collapsible('destroy');
115117
expect(group.is(':mage-collapsible')).toBeFalsy();
118+
group.remove();
116119
});
117120

118121
it('check if icons are added to title when initialized and removed when destroyed', function () {
@@ -135,6 +138,7 @@ define([
135138
group.collapsible('destroy');
136139
expect(group.is(':mage-collapsible')).toBeFalsy();
137140
expect(title.children('[data-role=icons]').length).toBeFalsy();
141+
group.remove();
138142
});
139143

140144
it('check if icon classes are changed when content gets expanded/collapsed', function () {
@@ -163,49 +167,7 @@ define([
163167

164168
group.collapsible('destroy');
165169
expect(group.is(':mage-collapsible')).toBeFalsy();
166-
});
167-
168-
it('check keyboard support', function () {
169-
var group = $('<div id="7"></div>'),
170-
title = $('<div data-role="title"></div>').appendTo(group),
171-
content = $('<div data-role="content"></div>').appendTo(group);
172-
173-
group.appendTo('body');
174-
175-
group.collapsible();
176-
expect(group.is(':mage-collapsible')).toBeTruthy();
177-
178-
group.collapsible('deactivate');
179-
expect(content.is(':hidden')).toBeTruthy();
180-
181-
title.on('focus', function () {
182-
title.trigger($.Event('keydown', {
183-
keyCode: $.ui.keyCode.ENTER
184-
}));
185-
expect(content.is(':visible')).toBeTruthy();
186-
187-
title.trigger($.Event('keydown', {
188-
keyCode: $.ui.keyCode.ENTER
189-
}));
190-
expect(content.is(':hidden')).toBeTruthy();
191-
192-
title.trigger($.Event('keydown', {
193-
keyCode: $.ui.keyCode.SPACE
194-
}));
195-
expect(content.is(':visible')).toBeTruthy();
196-
197-
title.trigger($.Event('keydown', {
198-
keyCode: $.ui.keyCode.SPACE
199-
}));
200-
expect(content.is(':hidden')).toBeTruthy();
201-
});
202-
203-
setTimeout(function () {
204-
title.focus();
205-
}, 10);
206-
207-
group.collapsible('destroy');
208-
expect(group.is(':mage-collapsible')).toBeFalsy();
170+
group.remove();
209171
});
210172

211173
it('check if content gets updated via Ajax when title is clicked', function () {
@@ -243,6 +205,7 @@ define([
243205

244206
group.collapsible('destroy');
245207
expect(group.is(':mage-collapsible')).toBeFalsy();
208+
group.remove();
246209
});
247210
});
248211
});

0 commit comments

Comments
 (0)