From a060ac5c7039f514cad88d042363e7a20dc555ba Mon Sep 17 00:00:00 2001
From: bernat <bernat@verdnatura.es>
Date: Wed, 11 Nov 2020 11:58:14 +0100
Subject: [PATCH] fix pr changes

---
 back/methods/image/specs/download.spec.js | 7 ++++---
 e2e/helpers/selectors.js                  | 2 +-
 e2e/paths/07-order/04_catalog.spec.js     | 3 ++-
 front/salix/components/layout/index.html  | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/back/methods/image/specs/download.spec.js b/back/methods/image/specs/download.spec.js
index 131e2c97a..e646d829d 100644
--- a/back/methods/image/specs/download.spec.js
+++ b/back/methods/image/specs/download.spec.js
@@ -1,17 +1,18 @@
 const app = require('vn-loopback/server/server');
 
-fdescribe('image download()', () => {
+describe('image download()', () => {
     const collection = 'user';
     const size = '160x160';
 
     it('should return the image content-type of the user', async() => {
         const userId = 9;
         const image = await app.models.Image.download(collection, size, userId);
+        const contentType = image[1];
 
-        expect(image[1]).toEqual('image/png');
+        expect(contentType).toEqual('image/png');
     });
 
-    it(`should return false if the user don't have image`, async() => {
+    it(`should return false if the user doesn't have image`, async() => {
         const userId = 110;
         const image = await app.models.Image.download(collection, size, userId);
 
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index e79477ef4..3df6eec8c 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -2,7 +2,7 @@
 export default {
     globalItems: {
         applicationsMenuButton: '#apps',
-        userMenuButton: 'div.side.end img',
+        userMenuButton: '#user',
         logoutButton: '#logout',
         applicationsMenuVisible: '.modules-menu',
         clientsButton: '.modules-menu [ui-sref="client.index"]',
diff --git a/e2e/paths/07-order/04_catalog.spec.js b/e2e/paths/07-order/04_catalog.spec.js
index b8a20e938..054e52c60 100644
--- a/e2e/paths/07-order/04_catalog.spec.js
+++ b/e2e/paths/07-order/04_catalog.spec.js
@@ -1,7 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
-describe('Order catalog', () => {
+fdescribe('Order catalog', () => {
     let browser;
     let page;
 
@@ -40,6 +40,7 @@ describe('Order catalog', () => {
     it('should perfom an "OR" search for the item tag colors silver and brown', async() => {
         await page.waitToClick(selectors.orderCatalog.openTagSearch);
         await page.autocompleteSearch(selectors.orderCatalog.tag, 'Color');
+        await page.wait(2999);
         await page.autocompleteSearch(selectors.orderCatalog.firstTagAutocomplete, 'silver');
         await page.waitToClick(selectors.orderCatalog.addTagButton);
         await page.autocompleteSearch(selectors.orderCatalog.secondTagAutocomplete, 'brown');
diff --git a/front/salix/components/layout/index.html b/front/salix/components/layout/index.html
index 84e9fe566..cb0fb93b4 100644
--- a/front/salix/components/layout/index.html
+++ b/front/salix/components/layout/index.html
@@ -33,6 +33,7 @@
         </vn-icon-button>
         <button class="buttonAccount">
             <img
+            id="user"
             ng-src="{{$ctrl.getImageUrl()}}"
             ng-click="userPopover.show($event)"
             translate-attr="{title: 'Account'}"