Skip to content

Commit 547d37b

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-59817
2 parents 1c5db5e + a5b4aea commit 547d37b

File tree

36 files changed

+92
-1411
lines changed

36 files changed

+92
-1411
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ atlassian*
2323
/lib/internal/flex/varien/.settings
2424
/node_modules
2525
/.grunt
26+
/Gruntfile.js
27+
/package.json
2628

2729
/pub/media/*.*
2830
!/pub/media/.htaccess

‎app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ define([
161161
defaultPlaceholder: $t('Select...'),
162162
lotPlaceholders: $t('Selected')
163163
},
164-
hoverElIndex: null,
165164
separator: 'optgroup',
166165
listens: {
167166
listVisible: 'cleanHoveredElement',
@@ -295,7 +294,6 @@ define([
295294
this._super();
296295
this.observe([
297296
'listVisible',
298-
'hoverElIndex',
299297
'placeholder',
300298
'multiselectFocus',
301299
'options',
@@ -539,7 +537,7 @@ define([
539537
},
540538

541539
/**
542-
* Clean hoverElIndex variable
540+
* Clean hoveredElement variable
543541
*
544542
* @returns {Object} Chainable
545543
*/

‎dev/tests/js/jasmine/spec_runner/tasks/jasmine.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ function init(config) {
3737
host: host,
3838
template: render(files.template),
3939
vendor: files.requireJs,
40+
junit: {
41+
path: "var/log/js-unit/",
42+
consolidate: true
43+
},
4044

4145
/**
4246
* @todo rename "helpers" to "specs" (implies overriding grunt-contrib-jasmine code)

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,6 @@ define([
2121
index: ''
2222
});
2323

24-
registry.set('provName', {
25-
on: function () {
26-
},
27-
get: function () {
28-
},
29-
set: function () {
30-
}
31-
});
32-
33-
describe('"initProperties" method', function () {
34-
it('Check for defined ', function () {
35-
expect(obj.hasOwnProperty('initProperties')).toBeDefined();
36-
});
37-
it('Check answer type', function () {
38-
var type = typeof obj.initProperties;
39-
40-
expect(type).toEqual('function');
41-
});
42-
it('Check returned value if method called without arguments', function () {
43-
expect(obj.initProperties()).toBeDefined();
44-
});
45-
it('Check returned value type if method called without arguments', function () {
46-
var type = typeof obj.initProperties();
47-
48-
expect(type).toEqual('object');
49-
});
50-
it('Check "displayed" property', function () {
51-
obj.displayed = null;
52-
obj.initProperties();
53-
expect(obj.displayed).toEqual([]);
54-
});
55-
});
5624
describe('"initObservable" method', function () {
5725
it('Check for defined ', function () {
5826
expect(obj.hasOwnProperty('initObservable')).toBeDefined();
@@ -178,16 +146,23 @@ define([
178146
prefix: 'magento'
179147
};
180148

149+
obj.getPreview = jasmine.createSpy().and.callFake(function () {
150+
return [];
151+
});
152+
181153
expect(obj.buildPreview(arg)).toBeDefined();
182154
});
183155
it('Check returned value type if method called with object argument', function () {
184156
var arg = {
185157
items: [],
186158
prefix: 'magento'
187-
},
188-
type = typeof obj.buildPreview(arg);
159+
};
160+
161+
obj.getPreview = jasmine.createSpy().and.callFake(function () {
162+
return [];
163+
});
189164

190-
expect(type).toEqual('string');
165+
expect(typeof obj.buildPreview(arg)).toEqual('string');
191166
});
192167
it('Check called "this.getPreview" method with object argument', function () {
193168
var arg = {

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,6 @@ define([
5656
expect(obj.observe).toHaveBeenCalled();
5757
});
5858
});
59-
describe('"onUniqueUpdate" method', function () {
60-
it('Check for defined ', function () {
61-
expect(obj.hasOwnProperty('onUniqueUpdate')).toBeDefined();
62-
});
63-
it('Check method type', function () {
64-
var type = typeof obj.onUniqueUpdate;
65-
66-
expect(type).toEqual('function');
67-
});
68-
it('Check called "this.trigger" inner onUniqueUpdate method', function () {
69-
obj.trigger = jasmine.createSpy().and.callFake(function () {
70-
return obj;
71-
});
72-
obj.onUniqueUpdate();
73-
expect(obj.trigger).toHaveBeenCalled();
74-
});
75-
});
7659
describe('"activate" method', function () {
7760
it('Check for defined ', function () {
7861
expect(obj.hasOwnProperty('activate')).toBeDefined();

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ define([
2323
});
2424

2525
window.FORM_KEY = 'magentoFormKey';
26-
registry.set('provName', {
27-
on: function () {
28-
},
29-
get: function () {
30-
},
31-
set: function () {
32-
}
33-
});
3426

3527
describe('"initElement" method', function () {
3628
it('Check for defined ', function () {
@@ -48,6 +40,8 @@ define([
4840
on: function () {
4941
},
5042
active: function () {
43+
},
44+
activate: function () {
5145
}
5246
};
5347

@@ -60,6 +54,8 @@ define([
6054
on: function () {
6155
},
6256
active: function () {
57+
},
58+
activate: function () {
6359
}
6460
},
6561
type = typeof obj.initElement(arg);
@@ -83,6 +79,8 @@ define([
8379
on: function () {
8480
},
8581
active: function () {
82+
},
83+
activate: function () {
8684
}
8785
};
8886

@@ -95,6 +93,8 @@ define([
9593
on: function () {
9694
},
9795
active: function () {
96+
},
97+
activate: function () {
9898
}
9999
},
100100
type = typeof obj.initActivation(arg);
@@ -119,6 +119,8 @@ define([
119119
},
120120
active: function () {
121121
},
122+
activate: function () {
123+
},
122124
delegate: jasmine.createSpy()
123125
};
124126

@@ -150,7 +152,7 @@ define([
150152
return [];
151153
});
152154
obj.onValidate();
153-
expect(obj.validate.calls.count()).toBe(3);
155+
expect(obj.validate.calls.count()).toBe(1);
154156
});
155157
});
156158
});

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ define([
4343
expect(model.validation).toEqual({});
4444
});
4545
});
46-
describe('initProperties method', function () {
47-
it('check for chainable', function () {
48-
expect(model.initProperties()).toEqual(model);
49-
});
50-
it('check for extend', function () {
51-
model.initProperties();
52-
expect(model.uid).toBeDefined();
53-
expect(model.noticeId).toBeDefined();
54-
expect(model.inputName).toBeDefined();
55-
});
56-
});
5746
describe('setInitialValue method', function () {
5847
it('check for chainable', function () {
5948
expect(model.setInitialValue()).toEqual(model);
@@ -78,15 +67,23 @@ define([
7867
expect(model.additionalClasses).toEqual(1);
7968
});
8069
it('check for empty additional class', function () {
70+
var expectedResult = {
71+
_required: model.required,
72+
_warn: model.warn,
73+
_error: model.error,
74+
_disabled: model.disabled
75+
};
76+
8177
model.additionalClasses = '';
8278

8379
expect(model._setClasses()).toEqual(model);
84-
expect(model.additionalClasses).toEqual('');
80+
expect(model.additionalClasses).toEqual(expectedResult);
8581
});
8682
it('check for one class in additional', function () {
8783
var extendObject = {
8884
simple: true,
89-
required: model.required,
85+
_required: model.required,
86+
_warn: model.warn,
9087
_error: model.error,
9188
_disabled: model.disabled
9289
};
@@ -98,7 +95,8 @@ define([
9895
it('check for one class with spaces in additional', function () {
9996
var extendObject = {
10097
simple: true,
101-
required: model.required,
98+
_required: model.required,
99+
_warn: model.warn,
102100
_error: model.error,
103101
_disabled: model.disabled
104102
};
@@ -111,7 +109,8 @@ define([
111109
var extendObject = {
112110
simple: true,
113111
example: true,
114-
required: model.required,
112+
_required: model.required,
113+
_warn: model.warn,
115114
_error: model.error,
116115
_disabled: model.disabled
117116
};
@@ -124,7 +123,8 @@ define([
124123
var extendObject = {
125124
simple: true,
126125
example: true,
127-
required: model.required,
126+
_required: model.required,
127+
_warn: model.warn,
128128
_error: model.error,
129129
_disabled: model.disabled
130130
};
@@ -139,10 +139,8 @@ define([
139139
expect(model.getInitialValue()).toEqual('');
140140
});
141141
it('check with default value', function () {
142-
var expected = 1;
143-
144-
model.default = expected;
145-
expect(model.getInitialValue()).toEqual(expected);
142+
model.default = 1;
143+
expect(model.getInitialValue()).toEqual('');
146144
});
147145
it('check with value', function () {
148146
var expected = 1;

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,5 @@ define([
1919
};
2020
model = new DateElement(params);
2121
});
22-
23-
describe('getInitialValue method', function () {
24-
it('check for default', function () {
25-
expect(model.getInitialValue()).toEqual('');
26-
});
27-
it('check with default value', function () {
28-
model.default = 1;
29-
expect(model.getInitialValue()).toEqual('01/01/1970');
30-
});
31-
it('check with value', function () {
32-
model.value(1);
33-
expect(model.getInitialValue()).toEqual('01/01/1970');
34-
});
35-
it('check with value and default', function () {
36-
model.default = 1;
37-
model.value(0);
38-
expect(model.getInitialValue()).toEqual(0);
39-
});
40-
});
41-
describe('initProperties method', function () {
42-
it('check for chainable', function () {
43-
expect(model.initProperties()).toEqual(model);
44-
});
45-
it('check for extend', function () {
46-
model.initProperties();
47-
expect(model.dateFormat).toBeDefined();
48-
});
49-
});
5022
});
5123
});

‎dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js

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

0 commit comments

Comments
 (0)