verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 Releases Wiki Activity

Merge

This commit is contained in:
Juan Ferrer 2019-11-12 09:24:08 +01:00
parent f6050a6c65
commit a4f6c64e59
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
front/core/components/field/style.scss
View File

@ -70,6 +70,9 @@
position: relative;
color: $color-font;
&::placeholder {
color: $color-font-bg;
}
&[type=time],
&[type=date],
&[type=password] {
@ -207,6 +210,10 @@
}
& > .infix > .control > * {
color: $color-font-dark;
&::placeholder {
color: $color-font-bg-dark;
}
}
& > .prepend,
& > .append,
@ -220,6 +227,10 @@
& > .container {
& > .infix > .control > * {
color: $color-font;
&::placeholder {
color: $color-font-bg;
}
}
& > .prepend,
& > .append,

2
front/core/lib/specs/acl-service.spec.js
View File

@ -39,7 +39,7 @@ describe('Service acl', () => {
expect(hasAny).toBeTruthy();
});
it('should return true when user has not any of the passed roles', () => {
it('should return false when user has not any of the passed roles', () => {
let hasAny = aclService.hasAny(['inventedRole', 'nonExistent']);
expect(hasAny).toBeFalsy();

17
modules/ticket/front/services/index.spec.js
View File

@ -19,17 +19,12 @@ describe('Ticket component vnTicketService', () => {
describe('getDefaultTaxClass', () => {
it('should set the default tax class in the controller', () => {
const config = {
filter: {
where: {
code: 'G'
}
}
};
let serializedParams = $httpParamSerializer(config);
$httpBackend.when('GET', `TaxClasses/findOne?${serializedParams}`).respond({id: 4000, name: 'Whatever', code: 'GG'});
$httpBackend.expect('GET', `TaxClasses/findOne?${serializedParams}`);
$httpBackend.whenRoute('GET', `TaxClasses/findOne`)
.respond({
id: 4000,
name: 'Whatever',
code: 'GG'
});
controller.getDefaultTaxClass();
$httpBackend.flush();