Merge

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,

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();

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 = {
+            $httpBackend.whenRoute('GET', `TaxClasses/findOne`)
-                filter: {
+                .respond({
-                    where: {
+                    id: 4000,
-                        code: 'G'
+                    name: 'Whatever',
-                    }
+                    code: 'GG'
-                }
+                });
-            };
-            let serializedParams = $httpParamSerializer(config);
-
-            $httpBackend.when('GET', `TaxClasses/findOne?${serializedParams}`).respond({id: 4000, name: 'Whatever', code: 'GG'});
-            $httpBackend.expect('GET', `TaxClasses/findOne?${serializedParams}`);
             controller.getDefaultTaxClass();
             $httpBackend.flush();