diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss index a56b8e7ddf..f3bc0ae046 100644 --- a/front/core/components/field/style.scss +++ b/front/core/components/field/style.scss @@ -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, diff --git a/front/core/lib/specs/acl-service.spec.js b/front/core/lib/specs/acl-service.spec.js index 7756347b03..3a14602419 100644 --- a/front/core/lib/specs/acl-service.spec.js +++ b/front/core/lib/specs/acl-service.spec.js @@ -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(); diff --git a/modules/ticket/front/services/index.spec.js b/modules/ticket/front/services/index.spec.js index b3c4adba56..b94b3e57fc 100644 --- a/modules/ticket/front/services/index.spec.js +++ b/modules/ticket/front/services/index.spec.js @@ -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();