verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Unit tests fixed

This commit is contained in:
Juan 2018-10-18 20:48:21 +02:00
parent ecee07530a
commit c4b3296959
15 changed files with 3774 additions and 3896 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
client/core/src/components/autocomplete/autocomplete.js
View File

@ -34,7 +34,6 @@ export default class Autocomplete extends Input {
this.assignDropdownProps();
this.showField = this.$.dropDown.showField;
this.valueField = this.$.dropDown.valueField;
this.linked = true;
this.refreshSelection();
}
@ -43,8 +42,7 @@ export default class Autocomplete extends Input {
}
set model(value) {
this._model = value;
this.assignDropdownProps();
this.dropDownAssign({model: value});
}
get data() {
@ -52,8 +50,7 @@ export default class Autocomplete extends Input {
}
set data(value) {
this._data = value;
this.assignDropdownProps();
this.dropDownAssign({data: value});
}
get url() {
@ -61,8 +58,14 @@ export default class Autocomplete extends Input {
}
set url(value) {
this._url = value;
this.assignDropdownProps();
this.dropDownAssign({url: value});
}
dropDownAssign(props) {
for (let prop in props)
this[`_${prop}`] = props[prop];
if (this.$.dropDown)
Object.assign(this.$.dropDown, props);
}
/**
@ -101,54 +104,55 @@ export default class Autocomplete extends Input {
}
refreshSelection() {
if (this.selectionIsValid(this._selection))
if (this._field == null) {
this.selection = null;
return;
}
if (!(this.valueField && this.showField)
|| this.selectionIsValid(this._selection))
return;
let value = this._field;
if (value && this.linked) {
if (this.selectionIsValid(this.initialData)) {
this.selection = this.initialData;
return;
}
if (this.$.dropDown) {
let data;
if (this.$.dropDown.model)
data = this.$.dropDown.model.orgData;
if (data)
for (let i = 0; i < data.length; i++)
if (data[i][this.valueField] === value) {
this.selection = data[i];
return;
}
this.requestSelection(value);
}
} else
this.selection = null;
this.selection = this.fetchSelection();
}
requestSelection(value) {
if (!this.url) return;
let where = {};
fetchSelection() {
if (this.selectionIsValid(this.initialData))
return this.initialData;
if (this.multiple)
where[this.valueField] = {inq: this.field};
else
where[this.valueField] = value;
if (!this.$.dropDown)
return null;
let filter = {
fields: this.$.dropDown.getFields(),
where: where
};
let data;
if (this.$.dropDown.model)
data = this.$.dropDown.model.orgData;
let json = encodeURIComponent(JSON.stringify(filter));
this.$http.get(`${this.url}?filter=${json}`).then(
json => this.onSelectionRequest(json.data),
() => this.onSelectionRequest(null)
);
if (data) {
let selection = data.find(i => this.selectionIsValid(i));
if (selection) return selection;
}
if (this.url) {
let where = {};
if (this.multiple)
where[this.valueField] = {inq: this.field};
else
where[this.valueField] = this._field;
let filter = {
fields: this.$.dropDown.getFields(),
where: where
};
let json = encodeURIComponent(JSON.stringify(filter));
this.$http.get(`${this.url}?filter=${json}`).then(
json => this.onSelectionRequest(json.data),
() => this.onSelectionRequest()
);
}
return null;
}
onSelectionRequest(data) {
@ -157,12 +161,8 @@ export default class Autocomplete extends Input {
this.selection = data;
else
this.selection = data[0];
} else {
let selection = {};
selection[this.showField] = this._field;
selection[this.valueField] = this._field;
this.selection = selection;
}
} else
this.selection = null;
}
refreshDisplayed() {

81
client/core/src/components/autocomplete/autocomplete.spec.js
View File

@ -1,74 +1,58 @@
import './autocomplete.js';
import template from './autocomplete.html';
describe('Component vnAutocomplete', () => {
let $element;
let $scope;
let $httpBackend;
let controller;
let $ctrl;
let data = {id: 1, name: 'Bruce Wayne'};
beforeEach(() => {
angular.mock.module('client');
});
beforeEach(ngModule('vnCore'));
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$timeout_) => {
$scope = $rootScope.$new();
$element = angular.element(`<div>${template}</div>`);
$httpBackend = _$httpBackend_;
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
controller = _$componentController_('vnAutocomplete', {$element, $scope, $httpBackend, $transclude: null});
beforeEach(angular.mock.inject(($compile, $rootScope) => {
$element = $compile(`<vn-autocomplete></vn-autocomplete>`)($rootScope);
$ctrl = $element.controller('vnAutocomplete');
}));
describe('url() setter', () => {
it(`should set url controllers property and call refreshSelection`, () => {
spyOn(controller, "refreshSelection");
controller.url = "url";
afterEach(() => {
$element.remove();
});
expect(controller.url).toEqual("url");
expect(controller.refreshSelection).toHaveBeenCalledWith();
describe('url() setter', () => {
it(`should set the url property`, () => {
$ctrl.url = '/TestModels';
expect($ctrl.url).toEqual('/TestModels');
});
});
describe('field() setter/getter', () => {
it(`should set field controllers property`, () => {
controller.field = data.id;
it(`should set the field property`, () => {
$ctrl.field = 'id';
expect(controller.field).toEqual(data.id);
expect($ctrl.field).toEqual('id');
});
});
describe('selection property', () => {
it(`should set selection finding an existing item in the initialData property`, () => {
controller.valueField = 'id';
controller.showField = 'name';
controller.initialData = data;
controller.field = data.id;
$ctrl.initialData = data;
$ctrl.field = data.id;
expect(controller.selection).toEqual(data);
expect($ctrl.selection).toEqual(data);
});
it(`should set selection finding an existing item in the data property`, () => {
controller.valueField = 'id';
controller.showField = 'name';
controller.data = [data];
controller.field = data.id;
$ctrl.data = [data];
$ctrl.field = data.id;
expect(controller.selection).toEqual(data);
expect($ctrl.selection).toEqual(data);
});
it(`should set selection to null when can't find an existing item in the data property`, () => {
controller.valueField = 'id';
controller.showField = 'name';
controller.field = data.id;
$ctrl.field = data.id;
expect(controller.selection).toEqual(null);
expect($ctrl.selection).toEqual(null);
});
it(`should perform a query if the item id isn't present in the data property`, () => {
controller.valueField = 'id';
controller.showField = 'name';
controller.url = 'localhost';
controller.field = data.id;
it(`should perform a query if the item id isn't present in the data property`, inject($httpBackend => {
$ctrl.url = '/TestModels';
let filter = {
fields: ['id', 'name'],
@ -76,10 +60,11 @@ describe('Component vnAutocomplete', () => {
};
let json = encodeURIComponent(JSON.stringify(filter));
$httpBackend.whenGET(`localhost?filter=${json}`).respond({});
$httpBackend.expectGET(`localhost?filter=${json}`);
controller.field = data.id;
$httpBackend.whenGET(`${$ctrl.url}?filter=${json}`).respond([data]);
$ctrl.field = data.id;
$httpBackend.flush();
});
expect($ctrl.selection).toEqual(data);
}));
});
});

1
client/core/src/components/drop-down/drop-down.js
View File

@ -20,6 +20,7 @@ export default class DropDown extends Component {
this.$filter = $filter;
this.valueField = 'id';
this.showField = 'name';
this._search = undefined;
this._activeOption = -1;
this.showLoadMore = true;

58
client/core/src/components/drop-down/drop-down.spec.js
View File

@ -1,56 +1,32 @@
import './drop-down.js';
import template from './drop-down.html';
describe('Component vnDropDown', () => {
let $componentController;
let $timeout;
let $element;
let $scope;
let $httpBackend;
let $transitions;
let $q;
let $filter;
let controller;
let $ctrl;
beforeEach(() => {
angular.mock.module('client');
});
beforeEach(ngModule('vnCore'));
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$timeout_, _$httpBackend_, _$q_, _$filter_, _$transitions_) => {
$componentController = _$componentController_;
$element = angular.element(`<div>${template}</div>`);
$timeout = _$timeout_;
$transitions = _$transitions_;
$q = _$q_;
$filter = _$filter_;
$scope = $rootScope.$new();
$httpBackend = _$httpBackend_;
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
let popoverTemplate = require('../popover/popover.html');
let $popover = angular.element(`<div>${popoverTemplate}</div>`);
$scope.popover = $componentController('vnPopover', {$element: $popover, $scope, $timeout, $transitions});
$scope.popover.$postLink();
$scope.model = $componentController('vnRestModel', {$httpBackend, $q, $filter});
controller = $componentController('vnDropDown', {$element, $scope, $transclude: null, $timeout, $httpBackend, $translate: null});
controller.$postLink();
controller.parent = angular.element('<vn-parent></vn-parent>')[0];
beforeEach(inject(($compile, $rootScope, $document) => {
$element = $compile(`<vn-drop-down></vn-drop-down>`)($rootScope);
$document.find('body').append($element);
$ctrl = $element.controller('vnDropDown');
}));
describe('show() method', () => {
it(`should define controllers _show using the value received as argument`, () => {
controller.show();
afterEach(() => {
$element.remove();
});
expect(controller.shown).toEqual(true);
describe('show() method', () => {
it(`should enable the show property`, () => {
$ctrl.show();
expect($ctrl.shown).toEqual(true);
});
});
describe('hide() method', () => {
it(`should define controllers _show using the value received as argument`, () => {
controller.hide();
it(`should disable the show property`, () => {
$ctrl.hide();
expect(controller.shown).toEqual(false);
expect($ctrl.shown).toEqual(false);
});
});
});

4
client/core/src/components/icon-menu/icon-menu.html
View File

@ -1,5 +1,7 @@
<div class="icon-menu">
<button class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-menu__button" ng-click="$ctrl.onClick($event)">
<button
class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored icon-menu__button"
ng-click="$ctrl.onClick($event)">
<vn-label vn-none translate>{{::$ctrl.label}}</vn-label>
<vn-icon vn-none icon="{{::$ctrl.icon}}"></vn-icon>
<vn-icon vn-none class="icon-menu__arrow_down" icon="keyboard_arrow_down"></vn-icon>

6
client/core/src/components/icon-menu/icon-menu.js
View File

@ -12,15 +12,13 @@ export default class IconMenu extends Input {
onClick(event) {
event.preventDefault();
if (this.onOpen) this.onOpen();
this.emit('open');
this.showDropDown();
}
onDropDownSelect(value) {
this.field = value;
if (this.onChange)
this.onChange({value});
this.emit('change', {value});
}
showDropDown() {

55
client/core/src/components/icon-menu/icon-menu.spec.js
View File

@ -1,53 +1,40 @@
import './icon-menu.js';
describe('Component vnIconMenu', () => {
let $componentController;
let controller;
let $ctrl;
let $element;
beforeEach(() => {
angular.mock.module('ticket');
});
beforeEach(ngModule('vnCore'));
beforeEach(angular.mock.inject(_$componentController_ => {
$componentController = _$componentController_;
$element = angular.element(`<div class="shown"></div>`);
controller = $componentController('vnIconMenu', {$element: $element, $transclude: null});
beforeEach(inject(($compile, $rootScope) => {
$element = $compile(`<vn-icon-menu></vn-icon-menu>`)($rootScope);
$ctrl = $element.controller('vnIconMenu');
}));
describe('getFields()', () => {
it(`should return an array with the fields selectables`, () => {
let fields = controller.getFields();
expect(fields).toEqual(['id', 'name']);
});
afterEach(() => {
$element.remove();
});
describe('onClick(event)', () => {
it(`should call preventDefault, onOpen and showDropdown`, () => {
let event = {preventDefault: () => {}};
controller.onOpen = () => {};
spyOn(event, 'preventDefault');
spyOn(controller, 'showDropDown');
spyOn(controller, 'onOpen');
it(`should emit the open event`, () => {
spyOn($ctrl, 'emit');
controller.onClick(event);
let event = new MouseEvent('click', {
view: $ctrl.element.window,
bubbles: true,
cancelable: true
});
$ctrl.onClick(event);
expect(event.preventDefault).toHaveBeenCalledWith();
expect(controller.showDropDown).toHaveBeenCalledWith();
expect(controller.onOpen).toHaveBeenCalledWith();
expect($ctrl.emit).toHaveBeenCalledWith('open');
});
});
describe('onDropDownSelect(value)', () => {
it(`should set field to a given value and call onChange`, () => {
controller.onChange = () => {};
spyOn(controller, 'onChange');
it(`should set field to the given value and emit the change event`, () => {
spyOn($ctrl, 'emit');
$ctrl.onDropDownSelect('mariano');
controller.onDropDownSelect('mariano');
expect(controller.field).toBe('mariano');
expect(controller.onChange).toHaveBeenCalledWith({value: 'mariano'});
expect($ctrl.field).toBe('mariano');
expect($ctrl.emit).toHaveBeenCalledWith('change', {value: 'mariano'});
});
});
});

6
client/core/src/components/popover/popover.js
View File

@ -64,8 +64,8 @@ export default class Popover extends Component {
}
/**
* Shows the popover. If a parent is specified it is shown in a visible
* relative position to it.
* Shows the popover emitting the open signal. If a parent is specified
* it is shown in a visible relative position to it.
*
* @param {HTMLElement} parent Overrides the parent property
*/
@ -90,7 +90,7 @@ export default class Popover extends Component {
}
/**
* Hides the popover.
* Hides the popover emitting the close signal.
*/
hide() {
if (!this._shown) return;

110
client/core/src/components/popover/popover.spec.js
View File

@ -1,83 +1,83 @@
import './popover';
describe('Component vnPopover', () => {
let $componentController;
let $httpBackend;
let $timeout;
let $element;
let controller;
let $parent;
let $ctrl;
beforeEach(() => {
angular.mock.module('client');
});
beforeEach(ngModule('vnCore'));
beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_, _$timeout_) => {
$componentController = _$componentController_;
$timeout = _$timeout_;
$element = angular.element(`<div class="shown"></div>`);
$httpBackend = _$httpBackend_;
_$httpBackend_.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
controller = $componentController('vnPopover', {$httpBackend, $element});
beforeEach(inject(($compile, $rootScope, $document) => {
$element = $compile(`<vn-popover>Test</vn-popover>`)($rootScope);
$document.find('body').append($element);
$ctrl = $element.controller('vnPopover');
$parent = angular.element('<div/>');
$document.find('body').append($parent);
}));
afterEach(() => {
$element.remove();
$parent.remove();
});
describe('show()', () => {
it(`should do nothing if _shown is defined in the controller`, () => {
controller._shown = true;
it(`should enable the shown property and emit the open event`, () => {
spyOn($ctrl, 'emit');
$ctrl.show();
spyOn(controller, 'relocate');
controller.show();
expect(controller.relocate).not.toHaveBeenCalledWith();
expect($ctrl.shown).toBeTruthy();
expect($ctrl.emit).toHaveBeenCalledWith('open');
});
it(`should not call on onOpen() as it is not defined in the controller`, () => {
controller.show();
it(`should do nothing if it's already shown`, () => {
$ctrl.shown = true;
spyOn($ctrl, 'emit');
$ctrl.show();
expect(controller.onOpen).toBeUndefined();
expect($ctrl.emit).not.toHaveBeenCalledWith('open');
});
it(`should call onOpen() if its defined`, () => {
controller.onOpen = () => {};
it(`should check that popover is visible into the screen`, () => {
$parent.css({
backgroundColor: 'red',
position: 'absolute',
width: '50px',
height: '50px',
top: '0',
left: '100px'
});
$ctrl.show($parent[0]);
spyOn(controller, 'onOpen');
let rect = $ctrl.popover.getBoundingClientRect();
let style = window.getComputedStyle($ctrl.element);
controller.show();
expect(style.visibility).toEqual('visible');
expect(style.display).not.toEqual('none');
expect(controller.onOpen).toHaveBeenCalledWith();
expect(0).toBeLessThanOrEqual(rect.top);
expect(0).toBeLessThanOrEqual(rect.left);
expect($ctrl.window.innerHeight).toBeGreaterThan(rect.bottom);
expect($ctrl.window.innerWidth).toBeGreaterThan(rect.right);
});
});
describe('hide()', () => {
it(`should do nothing if _shown is defined in the controller`, () => {
controller._shown = false;
controller.hide();
expect($element[0].classList).toContain('shown');
});
it(`should set _shown property to false and then call onClose() if its defined`, () => {
controller._shown = true;
controller.onClose = () => {};
spyOn(controller, 'onClose');
controller.hide();
it(`should disable the shown property and emit the close event`, inject($timeout => {
$ctrl.show();
spyOn($ctrl, 'emit');
$ctrl.hide();
$timeout.flush();
expect(controller._shown).toBeFalsy();
expect(controller.onClose).toHaveBeenCalledWith();
});
expect($ctrl.shown).toBeFalsy();
expect($ctrl.emit).toHaveBeenCalledWith('close');
}));
it(`should set _shown property to false and then call deregisterCallback() if its defined`, () => {
controller._shown = true;
controller.deregisterCallback = () => {};
spyOn(controller, 'deregisterCallback');
it(`should do nothing if it's already hidden`, () => {
$ctrl.shown = false;
spyOn($ctrl, 'emit');
$ctrl.hide();
controller.hide();
expect(controller._shown).toBeFalsy();
expect(controller.deregisterCallback).toHaveBeenCalledWith();
expect($ctrl.emit).not.toHaveBeenCalledWith('close');
});
});
});

2
client/salix/src/components/user-configuration-popover/index.spec.js
View File

@ -85,6 +85,8 @@ describe('Salix', () => {
it('should make a query with the property given and call showOk', () => {
spyOn(controller, 'showOk');
controller.company = 1;
$httpBackend.when('GET', `/api/UserConfigs/getUserConfig`).respond({companyFk: 2});
$httpBackend.expect('GET', `/api/UserConfigs/getUserConfig`);
$httpBackend.when('POST', `/api/UserConfigs/setUserConfig`, {companyFk: 1}).respond(200);
$httpBackend.expect('POST', `/api/UserConfigs/setUserConfig`, {companyFk: 1});
controller.setUserConfig('companyFk');

4
client/salix/src/module.js
View File

@ -87,8 +87,8 @@ function $exceptionHandler(vnApp, $window) {
} else if (exception.name == 'UserError') {
message = exception.message;
} else {
message = 'Ups! Something went wrong';
console.error(exception);
vnApp.showError('Ups! Something went wrong');
throw exception;
}
vnApp.showError(message);

19
client/test_index.js
View File

@ -2,5 +2,24 @@
// current directory and all subdirectories
import 'angular';
import 'angular-mocks';
window.inject = angular.mock.inject;
window.ngModule = function(moduleName) {
return angular.mock.module(moduleName, function($provide, $translateProvider) {
// To avoid unexpected request warnings caused by angular translate
// https://angular-translate.github.io/docs/#/guide/22_unit-testing-with-angular-translate
$provide.factory('customLocaleLoader', function($q) {
return function() {
let deferred = $q.defer();
deferred.resolve({});
return deferred.promise;
};
});
$translateProvider.useLoader('customLocaleLoader');
});
};
var testsContext = require.context('./', true, /\.spec\.js$/);
testsContext.keys().forEach(testsContext);

55
karma.conf.js
View File

@ -77,40 +77,31 @@ module.exports = function(config) {
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-sourcemap-loader'
]
],
customLaunchers: {
FirefoxHeadless: {
base: 'Firefox',
flags: ['-headless']
},
ChromeNoSandboxHeadless: {
base: 'Chrome',
flags: [
'--no-sandbox',
// See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
'--headless',
'--disable-gpu',
// Without a remote debugging port, Google Chrome exits immediately.
' --remote-debugging-port=9222'
]
}
}
};
let browserConfig;
if (process.env.FIREFOX_BIN)
baseConfig.browsers = ['FirefoxHeadless'];
else
baseConfig.browsers = ['ChromeNoSandboxHeadless'];
if (process.env.FIREFOX_BIN) {
browserConfig = {
browsers: ['FirefoxHeadless'],
customLaunchers: {
FirefoxHeadless: {
base: 'Firefox',
flags: ['-headless']
}
}
};
} else {
browserConfig = {
browsers: ['ChromeNoSandboxHeadless'],
customLaunchers: {
ChromeNoSandboxHeadless: {
base: 'Chrome',
flags: [
'--no-sandbox',
// See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
'--headless',
'--disable-gpu',
// Without a remote debugging port, Google Chrome exits immediately.
' --remote-debugging-port=9222'
]
}
}
};
}
Object.assign(baseConfig, browserConfig);
config.set(baseConfig);
};

7159
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
services/agency/package.json
View File

@ -16,4 +16,4 @@
"dependencies": {
"vn-loopback": "file:../loopback"
}
}
}