Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Joan Sanchez 2018-03-01 13:53:16 +01:00
commit 52503c1015
2 changed files with 3 additions and 3 deletions

View File

@ -14,8 +14,8 @@ describe('Client', () => {
controller = $componentController('vnClientIndex'); controller = $componentController('vnClientIndex');
})); }));
it('should define and set model property as an empty object', () => { it('should define and set clientSelected property as null', () => {
expect(controller.model).toEqual({}); expect(controller.clientSelected).toEqual(null);
}); });
// describe('search()', () => { // describe('search()', () => {

View File

@ -16,7 +16,7 @@ export default {
clientsIndex: { clientsIndex: {
searchClientInput: `${components.vnTextfield}`, searchClientInput: `${components.vnTextfield}`,
searchButton: `${components.vnSearchBar} > vn-icon-button > button`, searchButton: `${components.vnSearchBar} > vn-icon-button > button`,
searchResult: `${components.vnItemClient}:nth-child(1) > a`, searchResult: `${components.vnItemClient}:nth-child(1) > vn-horizontal > a`,
createClientButton: `${components.vnFloatButton}` createClientButton: `${components.vnFloatButton}`
}, },
createClientView: { createClientView: {