Merge branch 'dev' into 8041-unifyClassLink
gitea/salix-front/pipeline/pr-dev Build queued...
Details
gitea/salix-front/pipeline/pr-dev Build queued...
Details
This commit is contained in:
commit
33e624cf1e
|
@ -94,7 +94,7 @@ pipeline {
|
||||||
parallel {
|
parallel {
|
||||||
stage('Unit') {
|
stage('Unit') {
|
||||||
steps {
|
steps {
|
||||||
sh 'pnpm run test:unit:ci'
|
sh 'pnpm run test:front:ci'
|
||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
|
|
|
@ -23,7 +23,7 @@ quasar dev
|
||||||
### Run unit tests
|
### Run unit tests
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pnpm run test:unit
|
pnpm run test:front
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run e2e tests
|
### Run e2e tests
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
"test:e2e": "cypress open",
|
"test:e2e": "cypress open",
|
||||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||||
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
||||||
"test:unit": "vitest",
|
"test:front": "vitest",
|
||||||
"test:unit:ci": "vitest run",
|
"test:front:ci": "vitest run",
|
||||||
"commitlint": "commitlint --edit",
|
"commitlint": "commitlint --edit",
|
||||||
"prepare": "npx husky install",
|
"prepare": "npx husky install",
|
||||||
"addReferenceTag": "node .husky/addReferenceTag.js",
|
"addReferenceTag": "node .husky/addReferenceTag.js",
|
||||||
|
|
|
@ -681,6 +681,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
:hide-selected-banner="true"
|
:hide-selected-banner="true"
|
||||||
|
:data-cy="$props.dataCy ?? 'vnTable'"
|
||||||
>
|
>
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"> </slot>
|
<slot name="top-left"> </slot>
|
||||||
|
|
|
@ -656,7 +656,6 @@ onMounted(() => {
|
||||||
:without-header="!editableMode"
|
:without-header="!editableMode"
|
||||||
:with-filters="editableMode"
|
:with-filters="editableMode"
|
||||||
:right-search="editableMode"
|
:right-search="editableMode"
|
||||||
:right-search-icon="true"
|
|
||||||
:row-click="false"
|
:row-click="false"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:beforeSaveFn="beforeSave"
|
:beforeSaveFn="beforeSave"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
describe.skip('Entry', () => {
|
describe('Entry', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
cy.login('buyer');
|
cy.login('buyer');
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
describe.skip('EntryStockBought', () => {
|
describe('EntryStockBought', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.viewport(1920, 1080);
|
cy.viewport(1920, 1080);
|
||||||
cy.login('buyer');
|
cy.login('buyer');
|
||||||
|
@ -16,9 +16,9 @@ describe.skip('EntryStockBought', () => {
|
||||||
cy.get('input[aria-label="Reserve"]').type('1');
|
cy.get('input[aria-label="Reserve"]').type('1');
|
||||||
cy.get('input[aria-label="Date"]').eq(1).clear();
|
cy.get('input[aria-label="Date"]').eq(1).clear();
|
||||||
cy.get('input[aria-label="Date"]').eq(1).type('01-01');
|
cy.get('input[aria-label="Date"]').eq(1).type('01-01');
|
||||||
cy.get('input[aria-label="Buyer"]').type('buyerBossNick');
|
cy.get('input[aria-label="Buyer"]').type('itNick');
|
||||||
cy.get('div[role="listbox"] > div > div[role="option"]')
|
cy.get('div[role="listbox"] > div > div[role="option"]')
|
||||||
.eq(0)
|
.eq(1)
|
||||||
.should('be.visible')
|
.should('be.visible')
|
||||||
.click();
|
.click();
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// <reference types="cypress" />
|
/// <reference types="cypress" />
|
||||||
describe.skip('TicketList', () => {
|
describe('TicketList', () => {
|
||||||
const firstRow = 'tbody > :nth-child(1)';
|
const firstRow = 'tbody > :nth-child(1)';
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
|
Loading…
Reference in New Issue