verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 104 Releases Wiki Activity

refactor: request changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2025-01-31 07:56:40 +01:00
parent f70dd41a37
commit 4246275759
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/common/VnSelectWorker.vue
View File

@ -53,6 +53,7 @@ const url = computed(() => {
:fields="['id', 'name', 'nickname', 'code']"
:filter-options="['id', 'name', 'nickname', 'code']"
sort-by="nickname ASC"
data-cy="vnWorkerSelect"
>
<template #prepend v-if="$props.hasAvatar">
<VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />

6
src/pages/Item/ItemTypeList.vue
View File

@ -185,13 +185,11 @@ const columns = computed(() => [
:label="t('globals.name')"
data-cy="nameInput"
/>
<VnSelectWorker v-model="data.workerFk" data-cy="workerSelect" />
<VnSelectWorker v-model="data.workerFk" />
<VnSelect
:label="t('ItemCategory')"
v-model="data.categoryFk"
:options="itemCategoriesOptions"
option-value="id"
option-label="name"
hide-selected
data-cy="itemCategorySelect"
/>
@ -199,8 +197,6 @@ const columns = computed(() => [
:label="t('Temperature')"
v-model="data.temperatureFk"
:options="temperatureOptions"
option-value="id"
option-label="name"
hide-selected
data-cy="temperatureSelect"
/>

2
test/cypress/integration/item/itemBarcodes.spec.js
View File

@ -1,5 +1,5 @@
/// <reference types="cypress" />
describe('Item shelving', () => {
describe('ItemBarcodes', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');

21
test/cypress/integration/item/itemType.spec.js
View File

@ -1,5 +1,10 @@
/// <reference types="cypress" />
describe('Item type', () => {
const workerError = 'employeeNick';
const worker = 'buyerNick';
const category = 'Artificial';
const type = 'Flower';
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
@ -10,10 +15,10 @@ describe('Item type', () => {
cy.dataCy('vnTableCreateBtn').click();
cy.dataCy('codeInput').type('ALS');
cy.dataCy('nameInput').type('Alstroemeria');
cy.dataCy('workerSelect').type('employeeNick');
cy.get('.q-menu .q-item').contains('employeeNick').click();
cy.dataCy('itemCategorySelect').type('Artificial');
cy.get('.q-menu .q-item').contains('Artificial').click();
cy.dataCy('vnWorkerSelect').type(workerError);
cy.get('.q-menu .q-item').contains(workerError).click();
cy.dataCy('itemCategorySelect').type(category);
cy.get('.q-menu .q-item').contains(category).click();
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('An item type with the same code already exists');
});
@ -22,10 +27,10 @@ describe('Item type', () => {
cy.dataCy('vnTableCreateBtn').click();
cy.dataCy('codeInput').type('LIL');
cy.dataCy('nameInput').type('Lilium');
cy.dataCy('workerSelect').type('buyerNick');
cy.get('.q-menu .q-item').contains('buyerNick').click();
cy.dataCy('itemCategorySelect').type('Flower');
cy.get('.q-menu .q-item').contains('Flower').click();
cy.dataCy('vnWorkerSelect').type(worker);
cy.get('.q-menu .q-item').contains(worker).click();
cy.dataCy('itemCategorySelect').type(type);
cy.get('.q-menu .q-item').contains(type).click();
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('Data created');
});