verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

fix pr changes
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito 2020-11-11 11:58:14 +01:00
parent 1e95f0105a
commit a060ac5c70
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
back/methods/image/specs/download.spec.js
View File

@ -1,17 +1,18 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
fdescribe('image download()', () => { describe('image download()', () => {
const collection = 'user'; const collection = 'user';
const size = '160x160'; const size = '160x160';
it('should return the image content-type of the user', async() => { it('should return the image content-type of the user', async() => {
const userId = 9; const userId = 9;
const image = await app.models.Image.download(collection, size, userId); 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 userId = 110;
const image = await app.models.Image.download(collection, size, userId); const image = await app.models.Image.download(collection, size, userId);

2
e2e/helpers/selectors.js
View File

@ -2,7 +2,7 @@
export default { export default {
globalItems: { globalItems: {
applicationsMenuButton: '#apps', applicationsMenuButton: '#apps',
userMenuButton: 'div.side.end img', userMenuButton: '#user',
logoutButton: '#logout', logoutButton: '#logout',
applicationsMenuVisible: '.modules-menu', applicationsMenuVisible: '.modules-menu',
clientsButton: '.modules-menu [ui-sref="client.index"]', clientsButton: '.modules-menu [ui-sref="client.index"]',

3
e2e/paths/07-order/04_catalog.spec.js
View File

@ -1,7 +1,7 @@
import selectors from '../../helpers/selectors.js'; import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer'; import getBrowser from '../../helpers/puppeteer';
describe('Order catalog', () => { fdescribe('Order catalog', () => {
let browser; let browser;
let page; let page;
@ -40,6 +40,7 @@ describe('Order catalog', () => {
it('should perfom an "OR" search for the item tag colors silver and brown', async() => { it('should perfom an "OR" search for the item tag colors silver and brown', async() => {
await page.waitToClick(selectors.orderCatalog.openTagSearch); await page.waitToClick(selectors.orderCatalog.openTagSearch);
await page.autocompleteSearch(selectors.orderCatalog.tag, 'Color'); await page.autocompleteSearch(selectors.orderCatalog.tag, 'Color');
await page.wait(2999);
await page.autocompleteSearch(selectors.orderCatalog.firstTagAutocomplete, 'silver'); await page.autocompleteSearch(selectors.orderCatalog.firstTagAutocomplete, 'silver');
await page.waitToClick(selectors.orderCatalog.addTagButton); await page.waitToClick(selectors.orderCatalog.addTagButton);
await page.autocompleteSearch(selectors.orderCatalog.secondTagAutocomplete, 'brown'); await page.autocompleteSearch(selectors.orderCatalog.secondTagAutocomplete, 'brown');

1
front/salix/components/layout/index.html
View File

@ -33,6 +33,7 @@
</vn-icon-button> </vn-icon-button>
<button class="buttonAccount"> <button class="buttonAccount">
<img <img
id="user"
ng-src="{{$ctrl.getImageUrl()}}" ng-src="{{$ctrl.getImageUrl()}}"
ng-click="userPopover.show($event)" ng-click="userPopover.show($event)"
translate-attr="{title: 'Account'}" translate-attr="{title: 'Account'}"