diff --git a/.gitignore b/.gitignore
index 9269cefc51fa0178e49324a776bef8b575d7ac08..a5b85031db205be7a5ccdf34fbfb4ead11787617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,8 @@ atlassian*
/lib/internal/flex/varien/.settings
/node_modules
/.grunt
+/Gruntfile.js
+/package.json
/pub/media/*.*
!/pub/media/.htaccess
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
index 806964352be5f23ea088d91b683400d00020c342..6fbbc63af473c36baa9f5c7fdf55d2e0fa6b907c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -21,38 +21,6 @@ define([
index: ''
});
- registry.set('provName', {
- on: function () {
- },
- get: function () {
- },
- set: function () {
- }
- });
-
- describe('"initProperties" method', function () {
- it('Check for defined ', function () {
- expect(obj.hasOwnProperty('initProperties')).toBeDefined();
- });
- it('Check answer type', function () {
- var type = typeof obj.initProperties;
-
- expect(type).toEqual('function');
- });
- it('Check returned value if method called without arguments', function () {
- expect(obj.initProperties()).toBeDefined();
- });
- it('Check returned value type if method called without arguments', function () {
- var type = typeof obj.initProperties();
-
- expect(type).toEqual('object');
- });
- it('Check "displayed" property', function () {
- obj.displayed = null;
- obj.initProperties();
- expect(obj.displayed).toEqual([]);
- });
- });
describe('"initObservable" method', function () {
it('Check for defined ', function () {
expect(obj.hasOwnProperty('initObservable')).toBeDefined();
@@ -178,16 +146,23 @@ define([
prefix: 'magento'
};
+ obj.getPreview = jasmine.createSpy().and.callFake(function () {
+ return [];
+ });
+
expect(obj.buildPreview(arg)).toBeDefined();
});
it('Check returned value type if method called with object argument', function () {
var arg = {
items: [],
prefix: 'magento'
- },
- type = typeof obj.buildPreview(arg);
+ };
+
+ obj.getPreview = jasmine.createSpy().and.callFake(function () {
+ return [];
+ });
- expect(type).toEqual('string');
+ expect(typeof obj.buildPreview(arg)).toEqual('string');
});
it('Check called "this.getPreview" method with object argument', function () {
var arg = {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
index 56449c04406a08f0a8a5bc021726322ecd13bd59..10c9e5d35daeddeb16fa89b928f357b7770bdd66 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
@@ -56,23 +56,6 @@ define([
expect(obj.observe).toHaveBeenCalled();
});
});
- describe('"onUniqueUpdate" method', function () {
- it('Check for defined ', function () {
- expect(obj.hasOwnProperty('onUniqueUpdate')).toBeDefined();
- });
- it('Check method type', function () {
- var type = typeof obj.onUniqueUpdate;
-
- expect(type).toEqual('function');
- });
- it('Check called "this.trigger" inner onUniqueUpdate method', function () {
- obj.trigger = jasmine.createSpy().and.callFake(function () {
- return obj;
- });
- obj.onUniqueUpdate();
- expect(obj.trigger).toHaveBeenCalled();
- });
- });
describe('"activate" method', function () {
it('Check for defined ', function () {
expect(obj.hasOwnProperty('activate')).toBeDefined();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
index 173e803b14a2151df665ebd97bd145cf374f26ee..311b023a003a85fba8f8d4a7beb89f8cb65dce04 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
@@ -23,14 +23,6 @@ define([
});
window.FORM_KEY = 'magentoFormKey';
- registry.set('provName', {
- on: function () {
- },
- get: function () {
- },
- set: function () {
- }
- });
describe('"initElement" method', function () {
it('Check for defined ', function () {
@@ -48,6 +40,8 @@ define([
on: function () {
},
active: function () {
+ },
+ activate: function () {
}
};
@@ -60,6 +54,8 @@ define([
on: function () {
},
active: function () {
+ },
+ activate: function () {
}
},
type = typeof obj.initElement(arg);
@@ -83,6 +79,8 @@ define([
on: function () {
},
active: function () {
+ },
+ activate: function () {
}
};
@@ -95,6 +93,8 @@ define([
on: function () {
},
active: function () {
+ },
+ activate: function () {
}
},
type = typeof obj.initActivation(arg);
@@ -119,6 +119,8 @@ define([
},
active: function () {
},
+ activate: function () {
+ },
delegate: jasmine.createSpy()
};
@@ -150,7 +152,7 @@ define([
return [];
});
obj.onValidate();
- expect(obj.validate.calls.count()).toBe(3);
+ expect(obj.validate.calls.count()).toBe(1);
});
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
index 0923d84fce5ff0e39149219a2ba951dcc1b6ebf9..7730bc72f7af6e35ffea47a4e2c6831328672dcc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/abstract.test.js
@@ -43,17 +43,6 @@ define([
expect(model.validation).toEqual({});
});
});
- describe('initProperties method', function () {
- it('check for chainable', function () {
- expect(model.initProperties()).toEqual(model);
- });
- it('check for extend', function () {
- model.initProperties();
- expect(model.uid).toBeDefined();
- expect(model.noticeId).toBeDefined();
- expect(model.inputName).toBeDefined();
- });
- });
describe('setInitialValue method', function () {
it('check for chainable', function () {
expect(model.setInitialValue()).toEqual(model);
@@ -78,15 +67,23 @@ define([
expect(model.additionalClasses).toEqual(1);
});
it('check for empty additional class', function () {
+ var expectedResult = {
+ _required: model.required,
+ _warn: model.warn,
+ _error: model.error,
+ _disabled: model.disabled
+ };
+
model.additionalClasses = '';
expect(model._setClasses()).toEqual(model);
- expect(model.additionalClasses).toEqual('');
+ expect(model.additionalClasses).toEqual(expectedResult);
});
it('check for one class in additional', function () {
var extendObject = {
simple: true,
- required: model.required,
+ _required: model.required,
+ _warn: model.warn,
_error: model.error,
_disabled: model.disabled
};
@@ -98,7 +95,8 @@ define([
it('check for one class with spaces in additional', function () {
var extendObject = {
simple: true,
- required: model.required,
+ _required: model.required,
+ _warn: model.warn,
_error: model.error,
_disabled: model.disabled
};
@@ -111,7 +109,8 @@ define([
var extendObject = {
simple: true,
example: true,
- required: model.required,
+ _required: model.required,
+ _warn: model.warn,
_error: model.error,
_disabled: model.disabled
};
@@ -124,7 +123,8 @@ define([
var extendObject = {
simple: true,
example: true,
- required: model.required,
+ _required: model.required,
+ _warn: model.warn,
_error: model.error,
_disabled: model.disabled
};
@@ -139,10 +139,8 @@ define([
expect(model.getInitialValue()).toEqual('');
});
it('check with default value', function () {
- var expected = 1;
-
- model.default = expected;
- expect(model.getInitialValue()).toEqual(expected);
+ model.default = 1;
+ expect(model.getInitialValue()).toEqual('');
});
it('check with value', function () {
var expected = 1;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
index 632fef3d841d1becdc65ff4e8ddfdcc553a3557f..de6b83eaf2005d06c324c3b7da997b541d305522 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/date.test.js
@@ -19,33 +19,5 @@ define([
};
model = new DateElement(params);
});
-
- describe('getInitialValue method', function () {
- it('check for default', function () {
- expect(model.getInitialValue()).toEqual('');
- });
- it('check with default value', function () {
- model.default = 1;
- expect(model.getInitialValue()).toEqual('01/01/1970');
- });
- it('check with value', function () {
- model.value(1);
- expect(model.getInitialValue()).toEqual('01/01/1970');
- });
- it('check with value and default', function () {
- model.default = 1;
- model.value(0);
- expect(model.getInitialValue()).toEqual(0);
- });
- });
- describe('initProperties method', function () {
- it('check for chainable', function () {
- expect(model.initProperties()).toEqual(model);
- });
- it('check for extend', function () {
- model.initProperties();
- expect(model.dateFormat).toBeDefined();
- });
- });
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
deleted file mode 100644
index 09f21f6b175ee21661cc8138ae319fc9be98bd14..0000000000000000000000000000000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/*eslint max-nested-callbacks: 0*/
-
-define([
- 'Magento_Ui/js/form/element/multiselect'
-], function (MultiselectElement) {
- 'use strict';
-
- describe('Magento_Ui/js/form/element/multiselect', function () {
- var params, model;
-
- beforeEach(function () {
- params = {
- dataScope: 'multiselect'
- };
- model = new MultiselectElement(params);
- });
-
- describe('getInitialValue method', function () {
- it('check for default', function () {
- expect(model.getInitialValue()).toEqual(undefined);
- });
- it('check with default value', function () {
- model.indexedOptions = {
- Select: {
- value: 'value'
- }
- };
- model.default = 'Select';
- expect(model.getInitialValue()).toEqual(['value']);
- });
- it('check with value', function () {
- model.indexedOptions = {
- Select: {
- value: 'value'
- }
- };
- model.value('Select');
- expect(model.getInitialValue()).toEqual(['value']);
- });
- });
- });
-});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
index 4723440ffc4298f230c20cffcdb6893625822244..88203afba331333193482a79c3e061202e93a2b4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
@@ -117,33 +117,6 @@ define([
expect(type).toEqual('function');
});
- it('Check call method "this.validate" inner save method', function () {
- obj.validate = jasmine.createSpy();
- obj.source.get = jasmine.createSpy().and.callFake(function () {
- return true;
- });
- obj.save();
- expect(obj.validate).toHaveBeenCalled();
- });
- it('Check call method "this.source.get" inner save method', function () {
- obj.validate = jasmine.createSpy();
- obj.source.get = jasmine.createSpy().and.callFake(function () {
- return true;
- });
- obj.save();
- expect(obj.source.get).toHaveBeenCalled();
- });
- it('Check call method "this.submit" inner save method', function () {
- obj.validate = jasmine.createSpy();
- obj.source.get = jasmine.createSpy().and.callFake(function () {
- return false;
- });
- obj.submit = jasmine.createSpy().and.callFake(function () {
- return true;
- });
- obj.save();
- expect(obj.source.get).toHaveBeenCalled();
- });
});
describe('"submit" method', function () {
it('Check for defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
index d327e0f382724bfd78f22a63ae0ed3b2205eb79c..5ffa5792b0882385c26546d6fbd834f3dde68a03 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js
@@ -18,6 +18,7 @@ define([
describe('Magento_Ui/js/form/element/ui-select', function () {
var obj = new Constr({
+ name: 'uiSelect',
dataScope: '',
provider: 'provider'
});
@@ -185,10 +186,6 @@ define([
expect(type).toEqual('boolean');
});
- it('Must return false if "hoverElIndex" does not equal value', function () {
- obj.hoverElIndex(1);
- expect(obj.isHovered(2)).toEqual(false);
- });
});
describe('"toggleListVisible" method', function () {
it('Check for defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/column.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/column.test.js
index b4db54bdb7b65fec6a557dd12f0d10e878277ece..ccfccdd195f0292163eab823ae5b15a61713594c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/column.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/column.test.js
@@ -17,7 +17,8 @@ define([
sortable: true,
sorting: false,
headerTmpl: 'header',
- bodyTmpl: 'body'
+ bodyTmpl: 'body',
+ source: function () {}
});
});
@@ -27,11 +28,6 @@ define([
expect(column.sorting).toBe('asc');
});
- it('apply sorting in other direction', function () {
- column.sort(true).sort(true);
- expect(column.sorting).toBe('desc');
- });
-
it('remove sorting', function () {
column.sort(false);
expect(column.sorting).toBeFalsy();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/editing/bulk.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/editing/bulk.test.js
index 094ad409e5eb4415672702fb38eb219070b2fe54..bdbffbff347fe27c18b13b1c17b79f175f724ec2 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/editing/bulk.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/editing/bulk.test.js
@@ -13,6 +13,7 @@ define([
beforeEach(function () {
bulkObj = new Bulk();
+ bulkObj.editor = jasmine.createSpy('editor');
});
it('has initObservable', function () {
expect(bulkObj).toBeDefined();
@@ -33,5 +34,5 @@ define([
bulkObj.updateState();
expect(bulkObj.updateState).toHaveBeenCalled();
});
- })
-});
\ No newline at end of file
+ });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
index 0555f056f5e90822b1aca09f39c1c27b08f7cf8a..05a65b038f3e3783d2af10d1ab75f1a2c0ee135f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
@@ -13,7 +13,9 @@ define([
temp;
beforeEach(function () {
- filterObj = new Filter();
+ filterObj = new Filter({
+ name: 'filter'
+ });
});
it('has been initialized', function () {
expect(filterObj).toBeDefined();
@@ -39,16 +41,6 @@ define([
temp = filterObj.cancel();
expect(temp).toBeDefined();
});
- it('has isOpened method', function () {
- filterObj.opened = function () {
- return true;
- };
- filterObj.hasVisible = function () {
- return true;
- };
- temp = filterObj.isOpened();
- expect(temp).toBeTruthy();
- });
it('has isFilterVisible method', function () {
temp = {
visible: function () {
@@ -69,15 +61,5 @@ define([
filterObj.hasVisible();
expect(filterObj.hasVisible).toHaveBeenCalled();
});
- it('has extractActive method', function () {
- spyOn(filterObj, 'extractActive');
- filterObj.extractActive();
- expect(filterObj.extractActive).toHaveBeenCalled();
- });
- it('has extractPreviews method', function () {
- spyOn(filterObj, 'extractPreviews');
- filterObj.extractPreviews();
- expect(filterObj.extractPreviews).toHaveBeenCalled();
- });
});
-});
\ No newline at end of file
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/paging/paging.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/paging/paging.test.js
index 36c2823eaf9e62706bc4d0d12174fedad4d25049..a240e5cfd432597d4bb38e10957b4495d4ed48b2 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/paging/paging.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/paging/paging.test.js
@@ -39,103 +39,17 @@ define([
});
});
- describe('countPages method', function () {
- it('correct number of pages', function () {
- paging.countPages();
- expect(paging.pages).toBe(4);
- });
-
- it('if no records', function () {
- paging.totalRecords = 0;
- paging.countPages();
- expect(paging.pages).toBe(1);
- });
- });
-
- describe('page manipualations', function () {
- it('setPage method', function () {
- paging.setPage(2);
- expect(paging.current).toBe(2);
- });
-
- it('next', function () {
- paging.current = 1;
- paging.next();
- expect(paging.current).toBe(2);
- });
-
- it('next out of boundary', function () {
- paging.current = 4;
- paging.next();
- expect(paging.current).toBe(4);
- });
-
- it('prev', function () {
- paging.current = 4;
- paging.prev();
- expect(paging.current).toBe(3);
- });
-
- it('prev out of boundary', function () {
- paging.current = 1;
- paging.prev();
- expect(paging.current).toBe(1);
- });
-
- it('goFirst', function () {
- paging.goFirst();
- expect(paging.current).toBe(1);
- });
-
- it('goLast', function () {
- paging.goLast();
- expect(paging.current).toBe(4);
- });
-
- it('isFirst for 1st page', function () {
- paging.current = 1;
- expect(paging.isFirst()).toBeTruthy();
- });
-
- it('isFirst for 2nd page', function () {
- paging.current = 2;
- expect(paging.isFirst()).toBeFalsy();
- });
-
- it('isLast for last page', function () {
- paging.current = 4;
- expect(paging.isLast()).toBeTruthy();
- });
-
- it('isLast for first page', function () {
- paging.current = 1;
- expect(paging.isLast()).toBeFalsy();
- });
- });
-
- describe('countPages method', function () {
- it('correct number of pages', function () {
- paging.countPages();
- expect(paging.pages).toBe(4);
- });
-
- it('if no records', function () {
- paging.totalRecords = 0;
- paging.countPages();
- expect(paging.pages).toBe(1);
- });
- });
-
describe('onPagesChange method', function () {
it('pages amount became less than current', function () {
paging.current = 4;
expect(paging.current).toBe(4);
- paging.onPagesChange(2);
- expect(paging.current).toBe(2);
+ paging.pageSize = 3;
+ paging.onPagesChange();
+ expect(paging.current).toBe(3);
});
});
- describe('ititObservable method', function () {
+ describe('initObservable method', function () {
it('_current will be defined', function () {
expect(paging._current).toBeDefined();
});
@@ -144,14 +58,6 @@ define([
paging.current = 2;
expect(paging._current()).toBe(2);
});
-
- it('write into current', function () {
- spyOn(paging, 'normalize').and.callThrough();
- spyOn(paging._current, 'notifySubscribers');
- paging._current(4);
- expect(paging.current).toBe(4);
- expect(paging._current.notifySubscribers).toHaveBeenCalledWith(4);
- });
});
});
});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/resize.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/resize.test.js
index 948bfb84a85da7621273661ccf8da12483e196ab..4cbb9e73d5ae770bb1121b635dbf7ab4da260ecc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/resize.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/resize.test.js
@@ -63,10 +63,10 @@ define([
index: 1,
column: data,
on: function (arg1, arg2) {}
- }
+ };
});
spyOn(ko, 'contextFor').and.callFake(function () {
- return {$index: 1, $parent: obj}
+ return {$index: 1, $parent: obj};
});
$._data = jasmine.createSpy().and.callFake(function () {
return {
@@ -82,45 +82,6 @@ define([
type = typeof obj.initColumn;
expect(type).toEqual('function');
});
- it('Check call "this.getDefaultWidth" method', function () {
- spyOn(obj, 'getDefaultWidth');
- obj.initColumn('magento');
- expect(obj.getDefaultWidth).toHaveBeenCalledWith('magento');
- });
- it('Check call "this.hasColumn" method', function () {
- spyOn(obj, 'hasColumn').and.callFake(function () {
- return false;
- });
- obj.initColumn('magento');
- expect(obj.hasColumn).toHaveBeenCalled();
- });
- it('Check call "this.initResizableElement" method', function () {
- spyOn(obj, 'hasColumn').and.callFake(function () {
- return false;
- });
- spyOn(obj, 'initResizableElement').and.callFake(function (arg) {
- return true;
- });
- obj.initColumn('magento');
- expect(obj.initResizableElement).toHaveBeenCalled();
- });
- it('Check call "this.setStopPropagationHandler" method', function () {
- spyOn(obj, 'hasColumn').and.callFake(function () {
- return false;
- });
- spyOn(obj, 'setStopPropagationHandler').and.callFake(function (arg) {
- return true;
- });
- obj.initColumn('magento');
- expect(obj.setStopPropagationHandler).toHaveBeenCalledWith('magento');
- });
- it('Check call "this.refreshLastColumn" method', function () {
- spyOn(obj, 'refreshLastColumn').and.callFake(function (arg) {
- return true;
- });
- obj.initColumn('magento');
- expect(obj.refreshLastColumn).toHaveBeenCalledWith('magento');
- });
});
describe('"initResizableElement" method', function () {
beforeEach(function(){
@@ -194,9 +155,9 @@ define([
}
});
spyOn(ko, 'contextFor').and.callFake(function () {
- return {$index: ko.observable(1), $parent: obj}
+ return {$index: ko.observable(1), $parent: obj};
});
- spyOn(obj, 'getNextElement').and.callFake(function () {
+ spyOn(obj, 'getNextElements').and.callFake(function () {
return true;
});
event = {stopImmediatePropagation: function(){}}
@@ -215,9 +176,9 @@ define([
obj.mousedownHandler(event);
expect(obj.hasColumn).toHaveBeenCalled();
});
- it('Check call "this.getNextElement" method', function () {
+ it('Check call "this.getNextElements" method', function () {
obj.mousedownHandler(event);
- expect(obj.getNextElement).toHaveBeenCalled();
+ expect(obj.getNextElements).toHaveBeenCalled();
});
});
describe('"mousemoveHandler" method', function () {
@@ -261,7 +222,7 @@ define([
expect(obj.storageColumnsData[2]).toEqual(200);
});
});
- describe('"getNextElement" method', function () {
+ describe('"getNextElements" method', function () {
beforeEach(function(){
spyOn(ko, 'dataFor').and.callFake(function (data) {
return {
@@ -275,24 +236,24 @@ define([
});
});
it('Check for defined ', function () {
- expect(obj.hasOwnProperty('getNextElement')).toBeDefined();
+ expect(obj.hasOwnProperty('getNextElements')).toBeDefined();
});
it('Check method type', function () {
- type = typeof obj.getNextElement;
+ type = typeof obj.getNextElements;
expect(type).toEqual('function');
});
it('Check call "this.hasColumn" method', function () {
spyOn(obj, 'hasColumn').and.callFake(function () {
return 'magento';
});
- obj.getNextElement('magento');
+ obj.getNextElements('magento');
expect(obj.hasColumn).toHaveBeenCalled();
});
it('Check returned value', function () {
spyOn(obj, 'hasColumn').and.callFake(function () {
return 'magento';
});
- expect(obj.getNextElement('magento')).toEqual('magento');
+ expect(obj.getNextElements('magento')).toEqual('magento');
});
});
describe('"getDefaultWidth" method', function () {
@@ -337,21 +298,11 @@ define([
arg = { index: 'magento' };
expect(typeof obj.hasColumn(arg, false)).toEqual('boolean');
});
- it('Must return false if object columnsElements has not model.index property', function () {
- arg = { index: 'magento' };
- obj.columnsElements = {};
- expect(obj.hasColumn(arg, false)).toEqual(false);
- });
it('Must return true if object columnsElements has model.index property', function () {
arg = { index: 'magento' };
obj.columnsElements = {magento: 'magentoProp'};
expect(obj.hasColumn(arg, false)).toEqual(true);
});
- it('Must return property if object columnsElements has property and second argument is true', function () {
- arg = { index: 'magento' };
- obj.columnsElements = {magento: 'magentoProp'};
- expect(obj.hasColumn(arg, true)).toEqual('magentoProp');
- });
});
describe('"hasRow" method', function () {
it('Check for defined ', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/search/search.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/search/search.test.js
index b407fe3bebeae0153d60fe37a76953a50a1d72f6..e10061263d13a14214e50ab1266f809c96ec0883 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/search/search.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/search/search.test.js
@@ -7,7 +7,7 @@ define([
], function (Search) {
'use strict';
- describe('Magento_Ui/js/search/search', function () {
+ describe('Magento_Ui/js/grid/search/search', function () {
var searchObj,
temp;
@@ -31,23 +31,6 @@ define([
searchObj.initChips();
expect(searchObj.chips).toHaveBeenCalled();
});
- it('has clear', function () {
- spyOn(searchObj, 'value');
- searchObj.clear();
- expect(searchObj.value).toHaveBeenCalled();
- });
- it('has clear', function () {
- spyOn(searchObj, 'inputValue');
- searchObj.cancel();
- expect(searchObj.inputValue).toHaveBeenCalled();
- });
- it('has apply', function () {
- spyOn(searchObj, 'value');
- spyOn(searchObj, 'inputValue');
- searchObj.apply();
- expect(searchObj.value).toHaveBeenCalled();
- expect(searchObj.inputValue).toHaveBeenCalled();
- });
it('has updatePreview', function () {
spyOn(searchObj, 'updatePreview');
searchObj.updatePreview();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/sticky/sticky.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/sticky/sticky.test.js
index f3447dfc869d9ac7c0d549fca973cd5ae6e85519..426b453ab42852caf01763e5d6f73ff11933fffb 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/sticky/sticky.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/sticky/sticky.test.js
@@ -159,30 +159,6 @@ define([
stickyObj.adjustOffset();
expect(stickyObj.adjustOffset).toHaveBeenCalled();
});
- it('check "checkPos" method', function () {
- stickyObj.toolbarNode = {
- find: jasmine.createSpy().and.callFake(function () {
- return {
- css: jasmine.createSpy()
- };
- })
- };
-
- stickyObj.listingNode = {
- find: jasmine.createSpy().and.callFake(function () {
- return {
- css: jasmine.createSpy()
- };
- })
- };
-
- stickyObj.visible = false;
- stickyObj.getMustBeSticky = function(){
- return false;
- };
-
- expect(stickyObj.checkPos()).toEqual(false);
- })
});
})
});
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
index cf122dbc31fdfe14c0e7654abd232f2558562447..ff17bd826b5c212cf7e2fe624d7da70a3fca2177 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
@@ -19,9 +19,6 @@ define([
};
});
- it('has defaults', function () {
- expect(typeof linksObj.defaults).toEqual('object');
- });
it('has setLinks method', function () {
returnedValue = linksObj.setLinks(undefined, 'imports');
expect(typeof returnedValue).toEqual('object');
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
index fd814d0a68fd41a79daf74825595cbb402a6f752..a45deb1df23afc9263ad1476732ce58c912e6752 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
@@ -38,13 +38,6 @@ define([
expect(type).toEqual('object');
});
- it('Check assigned value after used method', function () {
- var elem = 'test',
- prop = 'magento';
-
- registry.set(elem, prop);
- expect(registry.storage.data.get(elem)).toEqual(prop);
- });
});
describe('"registry.get" method', function () {
it('Check for defined', function () {
@@ -63,14 +56,6 @@ define([
expect(type).toBeFalsy();
});
- it('Check called callback with arguments', function () {
- var elems = ['magento'],
- callback = function () {};
-
- registry.events.wait = jasmine.createSpy();
- registry.get(elems, callback);
- expect(registry.events.wait).toHaveBeenCalledWith(elems, callback);
- });
});
describe('"registry.remove" method', function () {
it('Check for defined', function () {
@@ -89,13 +74,6 @@ define([
expect(type).toEqual('object');
});
- it('Check called registry.storage.remove with arguments', function () {
- var elems = ['magento'];
-
- registry.storage.remove = jasmine.createSpy();
- registry.remove(elems);
- expect(registry.storage.remove).toHaveBeenCalledWith(elems);
- });
});
describe('"registry.has" method', function () {
it('Check for defined', function () {
@@ -106,24 +84,11 @@ define([
expect(type).toEqual('function');
});
- it('Check returned value if registry.storage has property', function () {
- var name = 'magento';
-
- registry.storage.data.set(name, 'magentoValue');
- expect(registry.has(name)).toEqual(true);
- });
it('Check returned value if registry.storage has not property', function () {
var name = 'magentoNonProperty';
expect(registry.has(name)).toEqual(false);
});
- it('Check called registry.storage.has with arguments', function () {
- var elems = ['magento'];
-
- registry.storage.has = jasmine.createSpy();
- registry.has(elems);
- expect(registry.storage.has).toHaveBeenCalledWith(elems);
- });
});
describe('"registry.async" method', function () {
it('Check for defined', function () {
@@ -149,22 +114,6 @@ define([
expect(type).toEqual('object');
});
- it('Check registry.storage for defined', function () {
- registry.create();
- expect(registry.storage).toBeDefined();
- });
- it('Check registry.storage type', function () {
- registry.create();
- expect(typeof registry.storage).toEqual('object');
- });
- it('Check registry.events for defined', function () {
- registry.create();
- expect(registry.events).toBeDefined();
- });
- it('Check registry.events type', function () {
- registry.create();
- expect(typeof registry.events).toEqual('object');
- });
});
});
});