From a8b28de2a4fd78c193caf0db7a99d8f886eae8e6 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 28 Jan 2025 14:39:28 +0100 Subject: [PATCH] fix: fixed list and e2e --- src/pages/Item/ItemTypeList.vue | 35 ++++++++++++++++--- .../cypress/integration/item/itemType.spec.js | 24 +++++-------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue index 93e98a8ae..7173d993f 100644 --- a/src/pages/Item/ItemTypeList.vue +++ b/src/pages/Item/ItemTypeList.vue @@ -5,6 +5,9 @@ import VnTable from 'components/VnTable/VnTable.vue'; import FetchData from 'components/FetchData.vue'; import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue'; import VnSection from 'src/components/common/VnSection.vue'; +import VnInput from 'src/components/common/VnInput.vue'; +import VnSelectWorker from 'src/components/common/VnSelectWorker.vue'; +import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const tableRef = ref(); @@ -60,20 +63,17 @@ const columns = computed(() => [ label: t('code'), isTitle: true, cardVisible: true, - create: true, }, { align: 'left', name: 'name', label: t('globals.name'), cardVisible: true, - create: true, }, { align: 'left', label: t('worker'), name: 'workerFk', - create: true, component: 'select', attrs: { url: 'Workers/search', @@ -100,7 +100,6 @@ const columns = computed(() => [ align: 'left', name: 'categoryFk', label: t('ItemCategory'), - create: true, component: 'select', attrs: { options: itemCategoriesOptions.value, @@ -112,7 +111,6 @@ const columns = computed(() => [ align: 'left', name: 'Temperature', label: t('Temperature'), - create: true, component: 'select', attrs: { options: temperatureOptions.value, @@ -180,6 +178,33 @@ const columns = computed(() => [ + diff --git a/test/cypress/integration/item/itemType.spec.js b/test/cypress/integration/item/itemType.spec.js index b0a7b0ca9..85e054e28 100644 --- a/test/cypress/integration/item/itemType.spec.js +++ b/test/cypress/integration/item/itemType.spec.js @@ -8,15 +8,11 @@ describe('Item type', () => { it('should throw an error if the code already exists', () => { cy.dataCy('vnTableCreateBtn').click(); - cy.get( - 'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]' - ).type('ALS'); - cy.get( - 'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]' - ).type('Alstroemeria'); - cy.dataCy('Worker_select').type('employeeNick'); + 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('ItemCategory_select').type('Artificial'); + cy.dataCy('itemCategorySelect').type('Artificial'); cy.get('.q-menu .q-item').contains('Artificial').click(); cy.dataCy('FormModelPopup_save').click(); cy.checkNotification('An item type with the same code already exists'); @@ -24,15 +20,11 @@ describe('Item type', () => { it('should create a new type', () => { cy.dataCy('vnTableCreateBtn').click(); - cy.get( - 'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]' - ).type('LIL'); - cy.get( - 'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]' - ).type('Lilium'); - cy.dataCy('Worker_select').type('buyerNick'); + 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('ItemCategory_select').type('Flower'); + cy.dataCy('itemCategorySelect').type('Flower'); cy.get('.q-menu .q-item').contains('Flower').click(); cy.dataCy('FormModelPopup_save').click(); cy.checkNotification('Data created');