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

WIP: #7283 item_missing_e2e #1029

Draft
jsegarra wants to merge 190 commits from 7283_item_missing_e2e into dev
pull from: 7283_item_missing_e2e
merge into: verdnatura:dev
Conversation 0 Commits 190 Files Changed 83 +94 -13
3 changed files with 94 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69e6f0f467 - Show all commits

19
src/components/CreateNewPostcodeForm.vue
View File

@ -56,10 +56,10 @@ async function onCityCreated(newTown, formData) {
} }
function setTown(newTown, data) { function setTown(newTown, data) {
if (!newTown) return;
town.value = newTown;
data.provinceFk = newTown.provinceFk; data.provinceFk = newTown.provinceFk;
data.countryFk = newTown.province.countryFk; data.countryFk = newTown.province.countryFk;
if (!newTown) return;
town.value = newTown;
} }
async function setProvince(id, data) { async function setProvince(id, data) {
@ -73,7 +73,7 @@ async function onProvinceCreated(data) {
await provincesFetchDataRef.value.fetch({ await provincesFetchDataRef.value.fetch({
where: { countryFk: postcodeFormData.countryFk }, where: { countryFk: postcodeFormData.countryFk },
}); });
postcodeFormData.provinceFk.value = data.id; postcodeFormData.provinceFk = data.id;
} }
watch( watch(
@ -158,6 +158,13 @@ async function handleCountries(data) {
auto-load auto-load
url="Towns/location" url="Towns/location"
/> />
<FetchData
ref="CountriesFetchDataRef"
:sort-by="['name ASC']"
@on-fetch="handleCountries"
auto-load
url="Countries"
/>
<FormModelPopup <FormModelPopup
url-create="postcodes" url-create="postcodes"
@ -169,6 +176,7 @@ async function handleCountries(data) {
@on-data-saved="onDataSaved" @on-data-saved="onDataSaved"
> >
<template #form-inputs="{ data, validate }"> <template #form-inputs="{ data, validate }">
{{ data }}
<VnRow> <VnRow>
<VnInput <VnInput
:label="t('Postcode')" :label="t('Postcode')"
@ -202,6 +210,7 @@ async function handleCountries(data) {
</template> </template>
<template #form> <template #form>
<CreateNewCityForm <CreateNewCityForm
data-cy="create-new-city-btn"
:country-fk="data.countryFk" :country-fk="data.countryFk"
:province-selected="data.provinceFk" :province-selected="data.provinceFk"
@on-data-saved=" @on-data-saved="
@ -220,12 +229,12 @@ async function handleCountries(data) {
v-model="data.provinceFk" v-model="data.provinceFk"
:clearable="true" :clearable="true"
@on-province-created="onProvinceCreated" @on-province-created="onProvinceCreated"
data-cy="create-new-province-btn"
/> />
<VnSelect <VnSelect
url="Countries"
:sort-by="['name ASC']"
:label="t('Country')" :label="t('Country')"
@update:options="handleCountries" @update:options="handleCountries"
:options="countriesOptions"
hide-selected hide-selected
option-label="name" option-label="name"
option-value="id" option-value="id"

83
test/cypress/integration/vnComponent/vnLocation.spec.js
View File

@ -137,24 +137,91 @@ describe('VnLocation', () => {
checkVnLocation(postCode, province); checkVnLocation(postCode, province);
}); });
it('Create city', () => { it.only('Create city without country', () => {
const postCode = '9011'; // const postCode = '9011';
const province = 'Saskatchew'; const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
cy.get(createLocationButton).click(); cy.get(createLocationButton).click();
cy.get(dialogInputs).eq(0).type(postCode); // cy.get(dialogInputs).eq(0).type(postCode);
// city create button // city create button
cy.get( cy.get(
`${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon` `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
).click(); ).click();
cy.selectOption('#q-portal--dialog--3 .q-select', 'one'); cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
cy.get('#q-portal--dialog--3 .q-input').type(province); cy.get('#q-portal--dialog--3 .q-input').type(cityName);
cy.get('#q-portal--dialog--3 .q-btn--standard').click(); cy.get('#q-portal--dialog--3 .q-btn--standard').click();
cy.get('#q-portal--dialog--1 .q-btn--standard').click(); // cy.get('#q-portal--dialog--1 .q-btn--standard').click();
cy.waitForElement('.q-form'); // cy.waitForElement('.q-form');
checkVnLocation(postCode, province); // checkVnLocation(postCode, province);
}); });
it.only('Create province without country', () => {
// const postCode = '9011';
const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
cy.get(createLocationButton).click();
// cy.get(dialogInputs).eq(0).type(postCode);
cy.get(
`${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
)
.eq(0)
.click();
cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
cy.countSelectOptions('#q-portal--dialog--3 .q-select', 4);
cy.get('#q-portal--dialog--3 .q-input').type(provinceName);
cy.get('#q-portal--dialog--3 .q-btn--standard').click();
// cy.get('#q-portal--dialog--1 .q-btn--standard').click();
// cy.waitForElement('.q-form');
// checkVnLocation(postCode, province);
});
it.only('Create city with country', () => {
// const postCode = '9011';
const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
cy.get(createLocationButton).click();
// cy.get(dialogInputs).eq(0).type(postCode);
// city create button
cy.selectOption(
`${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
'Italia'
);
cy.get(
`${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
).click();
cy.selectOption('#q-portal--dialog--4 .q-select', 'Province four');
cy.countSelectOptions('#q-portal--dialog--4 .q-select', 1);
cy.get('#q-portal--dialog--4 .q-input').type(cityName);
cy.get('#q-portal--dialog--4 .q-btn--standard').click();
// cy.get('#q-portal--dialog--1 .q-btn--standard').click();
// cy.waitForElement('.q-form');
// checkVnLocation(postCode, province);
});
it.only('Create province with country', () => {
// const postCode = '9011';
const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
cy.get(createLocationButton).click();
// cy.get(dialogInputs).eq(0).type(postCode);
cy.selectOption(
`${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
'España'
);
cy.get(
`${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
)
.eq(0)
.click();
cy.selectOption('#q-portal--dialog--4 .q-select', 'one');
cy.countSelectOptions('#q-portal--dialog--4 .q-select', 2);
cy.get('#q-portal--dialog--4 .q-input').type(provinceName);
cy.get('#q-portal--dialog--4 .q-btn--standard').click();
// cy.get('#q-portal--dialog--1 .q-btn--standard').click();
// cy.waitForElement('.q-form');
// checkVnLocation(postCode, province);
});
function checkVnLocation(postCode, province) { function checkVnLocation(postCode, province) {
cy.get(`${createForm.prefix}`).should('not.exist'); cy.get(`${createForm.prefix}`).should('not.exist');
cy.get('.q-form > .q-card > .vn-row:nth-child(6)') cy.get('.q-form > .q-card > .vn-row:nth-child(6)')

5
test/cypress/support/commands.js
View File

@ -91,6 +91,11 @@ Cypress.Commands.add('selectOption', (selector, option) => {
cy.get(selector).click(); cy.get(selector).click();
cy.get('.q-menu .q-item').contains(option).click(); cy.get('.q-menu .q-item').contains(option).click();
}); });
Cypress.Commands.add('countSelectOptions', (selector, option) => {
cy.waitForElement(selector);
cy.get(selector).click();
cy.get('.q-menu .q-item').should('have.length', option);
});
Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => { Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
cy.waitForElement('.q-form > .q-card'); cy.waitForElement('.q-form > .q-card');