diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..3c3629e64
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+node_modules
diff --git a/Jenkinsfile b/Jenkinsfile
index c20da8ab2..8efc2f880 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
#!/usr/bin/env groovy
def PROTECTED_BRANCH
+def IS_LATEST
def BRANCH_ENV = [
test: 'test',
@@ -10,16 +11,18 @@ def BRANCH_ENV = [
node {
stage('Setup') {
- env.FRONT_REPLICAS = 1
env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
PROTECTED_BRANCH = [
'dev',
'test',
'master',
+ 'main',
'beta'
].contains(env.BRANCH_NAME)
+ IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
+
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
echo "NODE_NAME: ${env.NODE_NAME}"
echo "WORKSPACE: ${env.WORKSPACE}"
@@ -58,6 +61,19 @@ pipeline {
PROJECT_NAME = 'lilium'
}
stages {
+ stage('Version') {
+ when {
+ expression { PROTECTED_BRANCH }
+ }
+ steps {
+ script {
+ def packageJson = readJSON file: 'package.json'
+ def version = "${packageJson.version}-build${env.BUILD_ID}"
+ writeFile(file: 'VERSION.txt', text: version)
+ echo "VERSION: ${version}"
+ }
+ }
+ }
stage('Install') {
environment {
NODE_ENV = ""
@@ -71,17 +87,48 @@ pipeline {
expression { !PROTECTED_BRANCH }
}
environment {
- NODE_ENV = ""
+ NODE_ENV = ''
+ CI = 'true'
+ TZ = 'Europe/Madrid'
}
- steps {
- sh 'pnpm run test:unit:ci'
- }
- post {
- always {
- junit(
- testResults: 'junitresults.xml',
- allowEmptyResults: true
- )
+ parallel {
+ stage('Unit') {
+ steps {
+ sh 'pnpm run test:unit:ci'
+ }
+ post {
+ always {
+ junit(
+ testResults: 'junit/vitest.xml',
+ allowEmptyResults: true
+ )
+ }
+ }
+ }
+ stage('E2E') {
+ environment {
+ CREDENTIALS = credentials('docker-registry')
+ COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
+ COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
+ }
+ steps {
+ script {
+ def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
+ sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
+ image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
+ sh 'cypress run --browser chromium'
+ }
+ }
+ }
+ post {
+ always {
+ sh "docker-compose ${env.COMPOSE_PARAMS} down"
+ junit(
+ testResults: 'junit/e2e.xml',
+ allowEmptyResults: true
+ )
+ }
+ }
}
}
}
@@ -91,25 +138,30 @@ pipeline {
}
environment {
CREDENTIALS = credentials('docker-registry')
+ VERSION = readFile 'VERSION.txt'
}
steps {
- sh 'quasar build'
script {
- def packageJson = readJSON file: 'package.json'
- env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+ sh 'quasar build'
+
+ def baseImage = "salix-frontend:${env.VERSION}"
+ def image = docker.build(baseImage, ".")
+ docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
+ image.push()
+ image.push(env.BRANCH_NAME)
+ if (IS_LATEST) image.push('latest')
+ }
}
- dockerBuild()
}
}
stage('Deploy') {
when {
expression { PROTECTED_BRANCH }
}
+ environment {
+ VERSION = readFile 'VERSION.txt'
+ }
steps {
- script {
- def packageJson = readJSON file: 'package.json'
- env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
- }
withKubeConfig([
serverUrl: "$KUBERNETES_API",
credentialsId: 'kubernetes',
diff --git a/cypress.config.js b/cypress.config.js
index 26b7725a5..dfe963a12 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,12 +1,37 @@
import { defineConfig } from 'cypress';
-// https://docs.cypress.io/app/tooling/reporters
-// https://docs.cypress.io/app/references/configuration
-// https://www.npmjs.com/package/cypress-mochawesome-reporter
+
+let urlHost, reporter, reporterOptions;
+
+if (process.env.CI) {
+ urlHost = 'front';
+ reporter = 'junit';
+ reporterOptions = {
+ mochaFile: 'junit/e2e.xml',
+ toConsole: false,
+ };
+} else {
+ urlHost = 'localhost';
+ reporter = 'cypress-mochawesome-reporter';
+ reporterOptions = {
+ charts: true,
+ reportPageTitle: 'Cypress Inline Reporter',
+ reportFilename: '[status]_[datetime]-report',
+ embeddedScreenshots: true,
+ reportDir: 'test/cypress/reports',
+ inlineAssets: true,
+ };
+}
export default defineConfig({
e2e: {
- baseUrl: 'http://localhost:9000/',
- experimentalStudio: true,
+ baseUrl: `http://${urlHost}:9000`,
+ experimentalStudio: false,
+ defaultCommandTimeout: 10000,
+ trashAssetsBeforeRuns: false,
+ requestTimeout: 10000,
+ responseTimeout: 30000,
+ pageLoadTimeout: 60000,
+ defaultBrowser: 'chromium',
fixturesFolder: 'test/cypress/fixtures',
screenshotsFolder: 'test/cypress/screenshots',
supportFile: 'test/cypress/support/index.js',
@@ -14,40 +39,19 @@ export default defineConfig({
downloadsFolder: 'test/cypress/downloads',
video: false,
specPattern: 'test/cypress/integration/**/*.spec.js',
- experimentalRunAllSpecs: false,
- watchForFileChanges: false,
- reporter: 'cypress-mochawesome-reporter',
- reporterOptions: {
- charts: true,
- reportPageTitle: 'Cypress Inline Reporter',
- reportFilename: '[status]_[datetime]-report',
- embeddedScreenshots: true,
- reportDir: 'test/cypress/reports',
- inlineAssets: true,
- },
+ experimentalRunAllSpecs: true,
+ watchForFileChanges: true,
+ reporter,
+ reporterOptions,
component: {
componentFolder: 'src',
testFiles: '**/*.spec.js',
supportFile: 'test/cypress/support/unit.js',
},
- setupNodeEvents: async (on, config) => {
- const plugin = await import('cypress-mochawesome-reporter/plugin');
- plugin.default(on);
-
- const fs = await import('fs');
- on('task', {
- deleteFile(filePath) {
- if (fs.existsSync(filePath)) {
- fs.unlinkSync(filePath);
- return true;
- }
- return false;
- },
- });
-
- return config;
- },
viewportWidth: 1280,
viewportHeight: 720,
},
+ experimentalMemoryManagement: true,
+ defaultCommandTimeout: 10000,
+ numTestsKeptInMemory: 2,
});
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index df793fc75..000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '3.7'
-services:
- main:
- image: registry.verdnatura.es/salix-frontend:${VERSION:?}
- build:
- context: .
- dockerfile: ./Dockerfile
diff --git a/docs/Dockerfile.dev b/docs/Dockerfile.dev
new file mode 100644
index 000000000..29b194ffa
--- /dev/null
+++ b/docs/Dockerfile.dev
@@ -0,0 +1,45 @@
+FROM debian:12.9-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+ ca-certificates \
+ curl \
+ gnupg2 \
+ && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+ && apt-get install -y --no-install-recommends nodejs \
+ && npm install -g corepack@0.31.0 \
+ && corepack enable pnpm \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update \
+ && apt-get -y --no-install-recommends install \
+ apt-utils \
+ chromium \
+ libasound2 \
+ libgbm-dev \
+ libgtk-3-0 \
+ libgtk2.0-0 \
+ libnotify-dev \
+ libnss3 \
+ libxss1 \
+ libxtst6 \
+ xauth \
+ xvfb \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN groupadd -r -g 1000 app \
+ && useradd -r -u 1000 -g app -m -d /home/app app
+USER app
+
+ENV SHELL=bash
+ENV PNPM_HOME="/home/app/.local/share/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+RUN pnpm setup \
+ && pnpm install --global cypress@13.6.6 \
+ && cypress install
+
+WORKDIR /app
diff --git a/proxy-serve.js b/proxy-serve.js
index 415968c85..1e9bcf96b 100644
--- a/proxy-serve.js
+++ b/proxy-serve.js
@@ -1,6 +1,6 @@
export default [
{
path: '/api',
- rule: { target: 'http://0.0.0.0:3000' },
+ rule: { target: 'http://127.0.0.1:3000' },
},
];
diff --git a/quasar.config.js b/quasar.config.js
index 9467c92af..8b6125a90 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -11,6 +11,7 @@
import { configure } from 'quasar/wrappers';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path';
+const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
export default configure(function (/* ctx */) {
return {
@@ -108,13 +109,17 @@ export default configure(function (/* ctx */) {
},
proxy: {
'/api': {
- target: 'http://0.0.0.0:3000',
+ target: target,
logLevel: 'debug',
changeOrigin: true,
secure: false,
},
},
open: false,
+ allowedHosts: [
+ 'front', // Agrega este nombre de host
+ 'localhost', // Opcional, para pruebas locales
+ ],
},
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 04ef13d45..182eeaafe 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
import VnConfirm from './ui/VnConfirm.vue';
import { tMobile } from 'src/composables/tMobile';
import { useArrayData } from 'src/composables/useArrayData';
+import { getDifferences, getUpdatedValues } from 'src/filters';
const { push } = useRouter();
const quasar = useQuasar();
@@ -284,7 +285,12 @@ function trimData(data) {
}
return data;
}
-
+function onBeforeSave(formData, originalData) {
+ return getUpdatedValues(
+ Object.keys(getDifferences(formData, originalData)),
+ formData,
+ );
+}
async function onKeyup(evt) {
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
const input = evt.target;
@@ -321,6 +327,7 @@ defineExpose({
class="q-pa-md"
:style="maxWidth ? 'max-width: ' + maxWidth : ''"
id="formModel"
+ :mapper="onBeforeSave"
>
<QCard>
<slot
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index e4b19988a..3e92c93a9 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -85,7 +85,15 @@ const refresh = () => window.location.reload();
</QTooltip>
<PinnedModules ref="pinnedModulesRef" />
</QBtn>
- <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
+ <QBtn
+ class="q-pa-none"
+ rounded
+ dense
+ flat
+ no-wrap
+ id="user"
+ data-cy="userPanel_btn"
+ >
<VnAvatar
:worker-id="user.id"
:title="user.name"
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2cce5d05c..fe4806193 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -519,7 +519,7 @@ function getToggleIcon(value) {
}
function formatColumnValue(col, row, dashIfEmpty) {
- if (col?.format) {
+ if (col?.format || row[col?.name + 'TextValue']) {
if (selectRegex.test(col?.component) && row[col?.name + 'TextValue']) {
return dashIfEmpty(row[col?.name + 'TextValue']);
} else {
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 8ac7c224f..baa36710c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -27,6 +27,7 @@ const claimActionsForm = ref();
const rows = ref([]);
const selectedRows = ref([]);
const destinationTypes = ref([]);
+const shelvings = ref([]);
const totalClaimed = ref(null);
const DEFAULT_MAX_RESPONSABILITY = 5;
const DEFAULT_MIN_RESPONSABILITY = 1;
@@ -56,6 +57,12 @@ const columns = computed(() => [
field: (row) => row.claimDestinationFk,
align: 'left',
},
+ {
+ name: 'shelving',
+ label: t('shelvings.shelving'),
+ field: (row) => row.shelvingFk,
+ align: 'left',
+ },
{
name: 'Landed',
label: t('Landed'),
@@ -125,6 +132,10 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
options.reload && claimActionsForm.value.reload();
}
}
+async function updateShelving(shelvingFk, row) {
+ await axios.patch(`ClaimEnds/${row.id}`, { shelvingFk });
+ claimActionsForm.value.reload();
+}
async function regularizeClaim() {
await post(`Claims/${claimId}/regularizeClaim`);
@@ -200,6 +211,7 @@ async function post(query, params) {
auto-load
@on-fetch="(data) => (destinationTypes = data)"
/>
+ <FetchData url="Shelvings" auto-load @on-fetch="(data) => (shelvings = data)" />
<RightMenu v-if="claim">
<template #right-panel>
<QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
@@ -312,6 +324,20 @@ async function post(query, params) {
/>
</QTd>
</template>
+ <template #body-cell-shelving="{ row }">
+ <QTd>
+ <VnSelect
+ v-model="row.shelvingFk"
+ :options="shelvings"
+ option-label="code"
+ option-value="id"
+ style="width: 100px"
+ hide-selected
+ @update:model-value="(value) => updateShelving(value, row)"
+ />
+ </QTd>
+ </template>
+
<template #body-cell-price="{ value }">
<QTd align="center">
{{ toCurrency(value) }}
@@ -354,7 +380,7 @@ async function post(query, params) {
(value) =>
updateDestination(
value,
- props.row
+ props.row,
)
"
/>
@@ -371,6 +397,17 @@ async function post(query, params) {
</QTable>
</template>
<template #moreBeforeActions>
+ <QBtn
+ color="primary"
+ text-color="white"
+ :unelevated="true"
+ :label="tMobile('Import claim')"
+ :title="t('Import claim')"
+ icon="Download"
+ @click="importToNewRefundTicket"
+ :disable="claim.claimStateFk == resolvedStateId"
+ :loading="loading"
+ />
<QBtn
color="primary"
text-color="white"
@@ -394,17 +431,6 @@ async function post(query, params) {
@click="dialogDestination = !dialogDestination"
:loading="loading"
/>
- <QBtn
- color="primary"
- text-color="white"
- :unelevated="true"
- :label="tMobile('Import claim')"
- :title="t('Import claim')"
- icon="Upload"
- @click="importToNewRefundTicket"
- :disable="claim.claimStateFk == resolvedStateId"
- :loading="loading"
- />
</template>
</CrudModel>
<QDialog v-model="dialogDestination">
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index d875126cb..e5273902c 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -19,30 +19,36 @@ const columns = [
name: 'itemFk',
label: t('Id item'),
columnFilter: false,
- align: 'left',
+ align: 'right',
},
{
name: 'ticketFk',
label: t('Ticket'),
columnFilter: false,
- align: 'left',
+ align: 'right',
},
{
name: 'claimDestinationFk',
label: t('Destination'),
columnFilter: false,
- align: 'left',
+ align: 'right',
+ },
+ {
+ name: 'shelvingCode',
+ label: t('Shelving'),
+ columnFilter: false,
+ align: 'right',
},
{
name: 'landed',
label: t('Landed'),
format: (row) => toDate(row.landed),
- align: 'left',
+ align: 'center',
},
{
name: 'quantity',
label: t('Quantity'),
- align: 'left',
+ align: 'right',
},
{
name: 'concept',
@@ -52,18 +58,18 @@ const columns = [
{
name: 'price',
label: t('Price'),
- align: 'left',
+ align: 'right',
},
{
name: 'discount',
label: t('Discount'),
format: ({ discount }) => toPercentage(discount / 100),
- align: 'left',
+ align: 'right',
},
{
name: 'total',
label: t('Total'),
- align: 'left',
+ align: 'right',
},
];
</script>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 1fd9f3e92..8be928134 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -163,10 +163,14 @@ const showExportationLetter = () => {
<QMenu anchor="top end" self="top start">
<QList>
<QItem v-ripple clickable @click="showSendInvoiceDialog('pdf')">
- <QItemSection>{{ t('Send PDF') }}</QItemSection>
+ <QItemSection data-cy="InvoiceOutDescriptorMenuSendPdfOption">
+ {{ t('Send PDF') }}
+ </QItemSection>
</QItem>
<QItem v-ripple clickable @click="showSendInvoiceDialog('csv')">
- <QItemSection>{{ t('Send CSV') }}</QItemSection>
+ <QItemSection data-cy="InvoiceOutDescriptorMenuSendCsvOption">
+ {{ t('Send CSV') }}
+ </QItemSection>
</QItem>
</QList>
</QMenu>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 43092e170..9723f3d2f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -22,7 +22,6 @@ import VnSection from 'src/components/common/VnSection.vue';
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
const tableRef = ref();
-const invoiceOutSerialsOptions = ref([]);
const customerOptions = ref([]);
const selectedRows = ref([]);
const hasSelectedCards = computed(() => selectedRows.value.length > 0);
@@ -389,7 +388,6 @@ watchEffect(selectedRows);
url="InvoiceOutSerials"
v-model="data.serial"
:label="t('invoiceOutModule.serial')"
- :options="invoiceOutSerialsOptions"
option-label="description"
option-value="code"
option-filter
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index 9dd31d186..f1baef432 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -24,6 +24,7 @@ invoiceOut:
min: Min
max: Max
hasPdf: Has PDF
+ search: Contains
card:
issued: Issued
customerCard: Customer card
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index 79ceb4aa8..afca27871 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -24,6 +24,7 @@ invoiceOut:
min: Min
max: Max
hasPdf: Tiene PDF
+ search: Contiene
card:
issued: Fecha emisión
customerCard: Ficha del cliente
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index af48f7f5c..c2a63ddd9 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -8,6 +8,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import FetchData from 'components/FetchData.vue';
import { useArrayData } from 'src/composables/useArrayData';
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
const { t } = useI18n();
const props = defineProps({
@@ -52,7 +53,7 @@ onMounted(async () => {
name: key,
value,
selectedField: { name: key, label: t(`params.${key}`) },
- })
+ }),
);
}
exprBuilder('state', arrayData.store?.userParams?.state);
@@ -157,6 +158,32 @@ onMounted(async () => {
/>
</QItemSection>
</QItem>
+ <QItem>
+ <QItemSection>
+ <VnInputDate
+ v-model="params.from"
+ :label="t('params.from')"
+ is-outlined
+ />
+ </QItemSection>
+ <QItemSection>
+ <VnInputDate
+ v-model="params.to"
+ :label="t('params.to')"
+ is-outlined
+ />
+ </QItemSection>
+ </QItem>
+ <QItem>
+ <QItemSection>
+ <VnInput
+ :label="t('params.daysOnward')"
+ v-model="params.daysOnward"
+ lazy-rules
+ is-outlined
+ />
+ </QItemSection>
+ </QItem>
<QItem>
<QItemSection>
<VnSelect
@@ -175,11 +202,10 @@ onMounted(async () => {
</QItem>
<QItem>
<QItemSection>
- <VnInput
- :label="t('params.daysOnward')"
- v-model="params.daysOnward"
- lazy-rules
- is-outlined
+ <QCheckbox
+ :label="t('params.mine')"
+ v-model="params.mine"
+ :toggle-indeterminate="false"
/>
</QItemSection>
</QItem>
diff --git a/test/cypress/.gitignore b/test/cypress/.gitignore
index c9793a5f2..3a1fcbf37 100644
--- a/test/cypress/.gitignore
+++ b/test/cypress/.gitignore
@@ -1,3 +1,7 @@
reports/*
+videos/*
screenshots/*
-downloads/*
\ No newline at end of file
+downloads/*
+storage/*
+reports/*
+docker/logs/*
diff --git a/test/cypress/back/datasources.json b/test/cypress/back/datasources.json
new file mode 100644
index 000000000..fa7b81e1c
--- /dev/null
+++ b/test/cypress/back/datasources.json
@@ -0,0 +1,149 @@
+{
+ "db": {
+ "connector": "memory",
+ "timezone": "local"
+ },
+ "vn": {
+ "connector": "vn-mysql",
+ "database": "vn",
+ "debug": false,
+ "host": "db",
+ "port": "3306",
+ "username": "root",
+ "password": "root",
+ "connectionLimit": 100,
+ "queueLimit": 100,
+ "multipleStatements": true,
+ "legacyUtcDateProcessing": false,
+ "timezone": "local",
+ "connectTimeout": 40000,
+ "acquireTimeout": 90000,
+ "waitForConnections": true,
+ "maxIdleTime": 60000,
+ "idleTimeout": 60000
+ },
+ "osticket": {
+ "connector": "memory",
+ "timezone": "local"
+ },
+ "tempStorage": {
+ "name": "tempStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/tmp",
+ "maxFileSize": "262144000",
+ "allowedContentTypes": [
+ "application/x-7z-compressed",
+ "application/x-zip-compressed",
+ "application/x-rar-compressed",
+ "application/octet-stream",
+ "application/pdf",
+ "application/zip",
+ "application/rar",
+ "multipart/x-zip",
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4"
+ ]
+ },
+ "dmsStorage": {
+ "name": "dmsStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "262144000",
+ "allowedContentTypes": [
+ "application/x-7z-compressed",
+ "application/x-zip-compressed",
+ "application/x-rar-compressed",
+ "application/octet-stream",
+ "application/pdf",
+ "application/zip",
+ "application/rar",
+ "multipart/x-zip",
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp"
+ ]
+ },
+ "imageStorage": {
+ "name": "imageStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/image",
+ "maxFileSize": "52428800",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp"
+ ]
+ },
+ "invoiceStorage": {
+ "name": "invoiceStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/pdfs/invoice",
+ "maxFileSize": "52428800",
+ "allowedContentTypes": [
+ "application/octet-stream",
+ "application/pdf"
+ ]
+ },
+ "claimStorage": {
+ "name": "claimStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "31457280",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4"
+ ]
+ },
+ "entryStorage": {
+ "name": "entryStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "31457280",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4"
+ ]
+ },
+ "supplierStorage": {
+ "name": "supplierStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "31457280",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4",
+ "application/pdf"
+ ]
+ },
+ "accessStorage": {
+ "name": "accessStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/access",
+ "maxFileSize": "524288000",
+ "allowedContentTypes": [
+ "application/x-7z-compressed"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/test/cypress/docker-compose.yml b/test/cypress/docker-compose.yml
new file mode 100644
index 000000000..9d51ee345
--- /dev/null
+++ b/test/cypress/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3.7'
+services:
+ back:
+ image: registry.verdnatura.es/salix-back:dev
+ volumes:
+ - ./test/cypress/storage:/salix/storage
+ - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
+ depends_on:
+ - db
+ dns_search: .
+ front:
+ image: lilium-dev:latest
+ command: pnpm exec quasar dev
+ volumes:
+ - .:/app
+ environment:
+ - CI
+ - TZ
+ dns_search: .
+ db:
+ image: registry.verdnatura.es/salix-db:dev
diff --git a/test/cypress/downloads/.keep b/test/cypress/downloads/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/integration/Order/orderCatalog.spec.js b/test/cypress/integration/Order/orderCatalog.spec.js
index 1770a6b56..a106d0e8a 100644
--- a/test/cypress/integration/Order/orderCatalog.spec.js
+++ b/test/cypress/integration/Order/orderCatalog.spec.js
@@ -41,7 +41,7 @@ describe('OrderCatalog', () => {
}
});
cy.get(
- '[data-cy="vn-searchbar"] > .q-field > .q-field__inner > .q-field__control'
+ '[data-cy="vn-searchbar"] > .q-field > .q-field__inner > .q-field__control',
).type('{enter}');
cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
cy.dataCy('catalogFilterValueDialogBtn').last().click();
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index 685e120ce..b0a16a2ad 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -1,6 +1,6 @@
/// <reference types="cypress" />
describe('ClaimAction', () => {
- const claimId = 2;
+ const claimId = 1;
const firstRow = 'tbody > :nth-child(1)';
const destinationRow = '.q-item__section > .q-field';
@@ -24,9 +24,9 @@ describe('ClaimAction', () => {
const rowData = [true];
cy.fillRow(firstRow, rowData);
- cy.get('[title="Change destination"]').click();
+ cy.get('[title="Change destination"]').click({ force: true });
cy.selectOption(destinationRow, 'Confeccion');
- cy.get('.q-card > .q-card__actions > .q-btn--standard').click();
+ cy.get('.q-card > .q-card__actions > .q-btn--standard').click({ force: true });
});
it('should regularize', () => {
diff --git a/test/cypress/integration/claim/claimNotes.spec.js b/test/cypress/integration/claim/claimNotes.spec.js
index d7a918db1..576671a38 100644
--- a/test/cypress/integration/claim/claimNotes.spec.js
+++ b/test/cypress/integration/claim/claimNotes.spec.js
@@ -8,7 +8,11 @@ describe('ClaimNotes', () => {
it('should add a new note', () => {
const message = 'This is a new message.';
- cy.get('.q-textarea').type(message);
+ cy.get('.q-textarea')
+ .should('be.visible')
+ .should('not.be.disabled')
+ .type(message);
+
cy.get(saveBtn).click();
cy.get(firstNote).should('have.text', message);
});
diff --git a/test/cypress/integration/claim/claimPhoto.spec.js b/test/cypress/integration/claim/claimPhoto.spec.js
index 0a7320060..2d33e66c1 100755
--- a/test/cypress/integration/claim/claimPhoto.spec.js
+++ b/test/cypress/integration/claim/claimPhoto.spec.js
@@ -23,14 +23,12 @@ describe.skip('ClaimPhoto', () => {
});
it('should open first image dialog change to second and close', () => {
- cy.get(
- ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
- ).click();
+ cy.get(':nth-last-child(1) > .q-card').click();
cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
'be.visible'
);
- cy.get('.q-carousel__control > .q-btn > .q-btn__content > .q-icon').click();
+ cy.get('.q-carousel__control > button').click();
cy.get(
'.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
@@ -42,7 +40,7 @@ describe.skip('ClaimPhoto', () => {
it('should remove third and fourth file', () => {
cy.get(
- '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+ '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
).click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
@@ -50,7 +48,7 @@ describe.skip('ClaimPhoto', () => {
cy.get('.q-notification__message').should('have.text', 'Data deleted');
cy.get(
- '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
+ '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
).click();
cy.get(
'.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
diff --git a/test/cypress/integration/client/clientBasicData.spec.js b/test/cypress/integration/client/clientBasicData.spec.js
index bed28dc22..8e0f0f6bd 100644
--- a/test/cypress/integration/client/clientBasicData.spec.js
+++ b/test/cypress/integration/client/clientBasicData.spec.js
@@ -8,7 +8,7 @@ describe('Client basic data', () => {
it('Should load layout', () => {
cy.get('.q-card').should('be.visible');
cy.dataCy('customerPhone').find('input').should('be.visible');
- cy.dataCy('customerPhone').find('input').type('123456789');
+ cy.dataCy('customerPhone').find('input').clear().type('123456789');
cy.get('.q-btn-group > .q-btn--standard').click();
cy.intercept('PATCH', '/api/Clients/1102', (req) => {
const { body } = req;
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index 4f99f0cb6..6a700c093 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -184,9 +184,8 @@ describe('Entry', () => {
}
function deleteEntry() {
- cy.get('[data-cy="descriptor-more-opts"]').click();
- cy.waitForElement('div[data-cy="delete-entry"]');
- cy.get('div[data-cy="delete-entry"]').should('be.visible').click();
+ cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
+ cy.waitForElement('div[data-cy="delete-entry"]').click();
cy.url().should('include', 'list');
}
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index bc36156b4..b282a19a5 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -9,7 +9,7 @@ describe('EntryStockBought', () => {
cy.get('[data-col-field="reserve"][data-row-index="0"]').click();
cy.get('input[name="reserve"]').type('10{enter}');
cy.get('button[title="Save"]').click();
- cy.get('.q-notification__message').should('have.text', 'Data saved');
+ cy.checkNotification('Data saved');
});
it('Should add a new reserved space for buyerBoss', () => {
cy.addBtnClick();
diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
index 82f0fa3b6..d3a84d226 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
@@ -1,6 +1,16 @@
/// <reference types="cypress" />
describe('InvoiceOut list', () => {
const serial = 'Española rapida';
+ const columnCheckbox =
+ '.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner';
+ const firstRowDescriptor =
+ 'tbody > :nth-child(1) > [data-col-field="clientFk"] > .no-padding > .link';
+ const firstRowCheckbox =
+ 'tbody > :nth-child(1) > :nth-child(1) > .q-checkbox > .q-checkbox__inner ';
+ const summaryPopupIcon = '.header > :nth-child(2) > .q-btn__content > .q-icon';
+ const filterBtn = '.q-scrollarea__content > .q-btn--standard > .q-btn__content';
+ const firstSummaryIcon =
+ ':nth-child(1) > .text-right > [data-cy="tableAction-0"] > .q-btn__content > .q-icon';
beforeEach(() => {
cy.viewport(1920, 1080);
@@ -9,18 +19,32 @@ describe('InvoiceOut list', () => {
cy.typeSearchbar('{enter}');
});
- it('should search and filter an invoice and enter to the summary', () => {
- cy.typeSearchbar('1{enter}');
- cy.get('.q-virtual-scroll__content > :nth-child(2) > :nth-child(7)').click();
- cy.get('.header > a.q-btn > .q-btn__content').click();
- cy.typeSearchbar('{enter}');
- cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}');
+ it('should download one pdf from the subtoolbar button', () => {
+ cy.get(firstRowCheckbox).click();
+ cy.dataCy('InvoiceOutDownloadPdfBtn').click();
});
it('should download all pdfs', () => {
- cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+ cy.get(columnCheckbox).click();
cy.dataCy('InvoiceOutDownloadPdfBtn').click();
- cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+ });
+
+ it('should open the invoice descriptor from table icon', () => {
+ cy.get(firstSummaryIcon).click();
+ cy.get('.cardSummary').should('be.visible');
+ cy.get('.summaryHeader > div').should('include.text', 'A1111111');
+ });
+
+ it('should open the client descriptor', () => {
+ cy.get(firstRowDescriptor).click();
+ cy.get(summaryPopupIcon).click();
+ });
+
+ it('should filter the results by client ID, then check the first result is correct', () => {
+ cy.dataCy('Customer ID_input').type('1103');
+ cy.get(filterBtn).click();
+ cy.get(firstRowDescriptor).click();
+ cy.get('.q-item > .q-item__label').should('include.text', '1103');
});
it('should give an error when manual invoicing a ticket that is already invoiced', () => {
@@ -31,11 +55,14 @@ describe('InvoiceOut list', () => {
cy.checkNotification('This ticket is already invoiced');
});
- it('should create a manual invoice and enter to its summary', () => {
+ it('should create a manual invoice and enter to its summary, then delete that invoice', () => {
cy.dataCy('vnTableCreateBtn').click();
- cy.dataCy('InvoiceOutCreateTicketinput').type(8);
+ cy.dataCy('InvoiceOutCreateTicketinput').type(9);
cy.selectOption('[data-cy="InvoiceOutCreateSerialSelect"]', serial);
cy.dataCy('FormModelPopup_save').click();
cy.checkNotification('Data created');
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get('.q-menu > .q-list > :nth-child(4)').click();
+ cy.dataCy('VnConfirm_confirm').click();
});
});
diff --git a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
index 02b7fbb43..4d530de05 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
@@ -1,11 +1,26 @@
/// <reference types="cypress" />
describe('InvoiceOut negative bases', () => {
+ const getDescriptors = (opt) =>
+ `:nth-child(1) > [data-col-field="${opt}"] > .no-padding > .link`;
+
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/invoice-out/negative-bases`);
});
+ it('should open the posible descriptors', () => {
+ cy.get(getDescriptors('clientId')).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '1101');
+ cy.get(getDescriptors('ticketFk')).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '23');
+ cy.get(getDescriptors('workerName')).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '18');
+ });
+
it('should filter and download as CSV', () => {
cy.get('input[name="ticketFk"]').type('23{enter}');
cy.get('#subToolbar > .q-btn').click();
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 44b0a9961..7ebaf3ef3 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -1,44 +1,95 @@
/// <reference types="cypress" />
-describe('InvoiceOut summary', () => {
+describe.skip('InvoiceOut summary', () => {
const transferInvoice = {
Client: { val: 'employee', type: 'select' },
Type: { val: 'Error in customer data', type: 'select' },
};
+ const firstRowDescriptors = (opt) =>
+ `tbody > :nth-child(1) > :nth-child(${opt}) > .q-btn`;
+ const toCustomerSummary = '[href="#/customer/1101"]';
+ const toTicketList = '[href="#/ticket/list?table={%22refFk%22:%22T1111111%22}"]';
+ const selectMenuOption = (opt) => `.q-menu > .q-list > :nth-child(${opt})`;
+ const confirmSend = '.q-btn--unelevated';
+
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
- cy.visit(`/#/invoice-out/list`);
+ cy.visit(`/#/invoice-out/1/summary`);
});
- it('should generate the invoice PDF', () => {
- cy.typeSearchbar('T1111111{enter}');
- cy.dataCy('descriptor-more-opts').click();
- cy.get('.q-menu > .q-list > :nth-child(6)').click();
- cy.dataCy('VnConfirm_confirm').click();
- cy.checkNotification('The invoice PDF document has been regenerated');
+ it('open the descriptors', () => {
+ cy.get(firstRowDescriptors(1)).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '1');
+ cy.get(firstRowDescriptors(2)).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '1101');
});
- it('should refund the invoice ', () => {
+
+ it('should open the client summary and the ticket list', () => {
+ cy.get(toCustomerSummary).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.get('.q-item > .q-item__label').should('include.text', '1101');
+ });
+
+ it('should open the ticket list', () => {
+ cy.get(toTicketList).click();
+ cy.get('.descriptor').should('be.visible');
+ cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
+ });
+
+ it('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click();
- cy.get('.q-menu > .q-list > :nth-child(7)').click();
- cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
- cy.checkNotification('The following refund ticket have been created');
+ cy.get(selectMenuOption(1)).click();
+ cy.fillInForm(transferInvoice);
+ cy.get('.q-mt-lg > .q-btn').click();
+ cy.checkNotification('Transferred invoice');
+ });
+
+ it('should send the invoice as PDF', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get(selectMenuOption(3)).click();
+ cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
+ cy.get(confirmSend).click();
+ cy.checkNotification('Notification sent');
+ });
+
+ it('should send the invoice as CSV', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get(selectMenuOption(3)).click();
+ cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
+ cy.get(confirmSend).click();
+ cy.checkNotification('Notification sent');
});
it('should delete an invoice ', () => {
cy.typeSearchbar('T2222222{enter}');
cy.dataCy('descriptor-more-opts').click();
- cy.get('.q-menu > .q-list > :nth-child(4)').click();
+ cy.get(selectMenuOption(4)).click();
cy.dataCy('VnConfirm_confirm').click();
cy.checkNotification('InvoiceOut deleted');
});
- it('should transfer the invoice ', () => {
- cy.typeSearchbar('T1111111{enter}');
+
+ it('should book the invoice', () => {
cy.dataCy('descriptor-more-opts').click();
- cy.get('.q-menu > .q-list > :nth-child(1)').click();
- cy.fillInForm(transferInvoice);
- cy.get('.q-mt-lg > .q-btn').click();
- cy.checkNotification('Transferred invoice');
+ cy.get(selectMenuOption(5)).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ cy.checkNotification('InvoiceOut booked');
+ });
+
+ it('should generate the invoice PDF', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get(selectMenuOption(6)).click();
+ cy.dataCy('VnConfirm_confirm').click();
+ cy.checkNotification('The invoice PDF document has been regenerated');
+ });
+
+ it('should refund the invoice ', () => {
+ cy.dataCy('descriptor-more-opts').click();
+ cy.get(selectMenuOption(7)).click();
+ cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
+ cy.checkNotification('The following refund ticket have been created');
});
});
diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
index d1596f693..d7a9ea4b3 100644
--- a/test/cypress/integration/item/itemTag.spec.js
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -4,25 +4,21 @@ describe('Item tag', () => {
cy.viewport(1920, 1080);
cy.login('developer');
cy.visit(`/#/item/1/tags`);
+ cy.get('.q-page').should('be.visible');
+ cy.waitForElement('[data-cy="itemTags"]');
});
it('should throw an error adding an existent tag', () => {
- cy.get('.q-page').should('be.visible');
cy.get('.q-page-sticky > div').click();
- cy.get('.q-page-sticky > div').click();
- cy.dataCy('Tag_select').eq(7).type('Tallos');
- cy.get('.q-menu .q-item').contains('Tallos').click();
+ cy.selectOption(':nth-child(8) > .q-select', 'Tallos');
cy.get(':nth-child(8) > [label="Value"]').type('1');
cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification("The tag or priority can't be repeated for an item");
});
it('should add a new tag', () => {
- cy.get('.q-page').should('be.visible');
cy.get('.q-page-sticky > div').click();
- cy.get('.q-page-sticky > div').click();
- cy.dataCy('Tag_select').eq(7).click();
- cy.get('.q-menu .q-item').contains('Ancho de la base').type('{enter}');
+ cy.selectOption(':nth-child(8) > .q-select', 'Ancho de la base');
cy.get(':nth-child(8) > [label="Value"]').type('50');
cy.dataCy('crudModelDefaultSaveBtn').click();
cy.checkNotification('Data saved');
diff --git a/test/cypress/integration/outLogin/recoverPassword.spec.js b/test/cypress/integration/outLogin/recoverPassword.spec.js
index eec81b661..48f6f8563 100755
--- a/test/cypress/integration/outLogin/recoverPassword.spec.js
+++ b/test/cypress/integration/outLogin/recoverPassword.spec.js
@@ -24,7 +24,7 @@ describe('Recover Password', () => {
it('should change password to user', () => {
// Get token from mail
cy.request(
- `http://localhost:3000/api/Mails?filter=%7B%22where%22%3A%20%7B%22receiver%22%3A%20%22${username}%40mydomain.com%22%7D%2C%20%22order%22%3A%20%5B%22id%20DESC%22%5D%7D&access_token=DEFAULT_TOKEN`
+ `/api/Mails?filter=%7B%22where%22%3A%20%7B%22receiver%22%3A%20%22${username}%40mydomain.com%22%7D%2C%20%22order%22%3A%20%5B%22id%20DESC%22%5D%7D&access_token=DEFAULT_TOKEN`
).then((response) => {
const regex = /access_token=([a-zA-Z0-9]+)/;
const [match] = response.body[0].body.match(regex);
diff --git a/test/cypress/integration/outLogin/twoFactor.spec.js b/test/cypress/integration/outLogin/twoFactor.spec.js
index 4d8561f0f..6a8ac9c06 100755
--- a/test/cypress/integration/outLogin/twoFactor.spec.js
+++ b/test/cypress/integration/outLogin/twoFactor.spec.js
@@ -11,7 +11,7 @@ describe('Two Factor', () => {
it('should enable two factor to sysadmin', () => {
cy.request(
'PATCH',
- `http://localhost:3000/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
+ `/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
{ twoFactor: 'email' }
);
});
@@ -41,7 +41,7 @@ describe('Two Factor', () => {
// Get code from mail
cy.request(
- `http://localhost:3000/api/Mails?filter=%7B%22where%22%3A%20%7B%22receiver%22%3A%20%22${username}%40mydomain.com%22%7D%2C%20%22order%22%3A%20%5B%22id%20DESC%22%5D%7D&access_token=DEFAULT_TOKEN`
+ `/api/Mails?filter=%7B%22where%22%3A%20%7B%22receiver%22%3A%20%22${username}%40mydomain.com%22%7D%2C%20%22order%22%3A%20%5B%22id%20DESC%22%5D%7D&access_token=DEFAULT_TOKEN`
).then((response) => {
const tempDiv = document.createElement('div');
tempDiv.innerHTML = response.body[0].body;
diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 82ec6626d..5679ceba1 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -1,4 +1,4 @@
-describe('AgencyWorkCenter', () => {
+describe.skip('AgencyWorkCenter', () => {
beforeEach(() => {
cy.viewport(1920, 1080);
cy.login('developer');
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 34d3d3a29..e3505ad60 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -1,4 +1,4 @@
-describe('Route extended list', () => {
+describe.skip('Route extended list', () => {
const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`;
const selectors = {
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index 976ce7352..04278cfc5 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -7,7 +7,7 @@ describe('Route', () => {
it('Route list create route', () => {
cy.addBtnClick();
- cy.get('input[name="description"]').type('routeTestOne{enter}');
+ cy.get('.q-card input[name="description"]').type('routeTestOne{enter}');
cy.get('.q-notification__message').should('have.text', 'Data created');
cy.url().should('include', '/summary');
});
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 63562bd26..b59765ca6 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,7 +1,7 @@
/// <reference types="cypress" />
describe('TicketSale', () => {
- describe('Free ticket #31', () => {
+ describe.skip('Free ticket #31', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
@@ -121,7 +121,7 @@ describe('TicketSale', () => {
cy.url().should('match', /\/ticket\/31\/log/);
});
});
- describe('Ticket prepared #23', () => {
+ describe.skip('Ticket prepared #23', () => {
beforeEach(() => {
cy.login('developer');
cy.viewport(1920, 1080);
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 751b3a065..292b2a395 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -40,7 +40,7 @@ describe('VnLocation', () => {
cy.selectOption(countrySelector, country);
cy.dataCy('locationProvince').type(`${province}{enter}`);
cy.get(
- `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `
+ `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `,
).click();
cy.dataCy('locationProvince').should('have.value', province);
});
@@ -87,7 +87,7 @@ describe('VnLocation', () => {
.get(':nth-child(1)')
.should('have.length.at.least', 2);
cy.get(
- firstOption.concat(' > .q-item__section > .q-item__label--caption')
+ firstOption.concat(' > .q-item__section > .q-item__label--caption'),
).should('have.text', postCodeLabel);
cy.get(firstOption).click();
cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
@@ -103,7 +103,7 @@ describe('VnLocation', () => {
cy.get('.q-card > h1').should('have.text', 'New postcode');
cy.selectOption(
`${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
- province
+ province,
);
cy.get(dialogInputs).eq(0).clear();
cy.get(dialogInputs).eq(0).type(postCode);
@@ -156,7 +156,7 @@ describe('VnLocation', () => {
cy.get(createLocationButton).click();
cy.selectOption(
`${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
- 'España'
+ 'España',
);
cy.dataCy('Province_icon').click();
diff --git a/test/cypress/integration/worker/workerNotificationsManager.spec.js b/test/cypress/integration/worker/workerNotificationsManager.spec.js
index ad48d8a6c..0907cc4ad 100644
--- a/test/cypress/integration/worker/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/worker/workerNotificationsManager.spec.js
@@ -22,7 +22,7 @@ describe('WorkerNotificationsManager', () => {
);
});
- it('should active a notification that is yours', () => {
+ it.skip('should active a notification that is yours', () => {
cy.login('developer');
cy.visit(`/#/worker/${developerId}/notifications`);
cy.waitForElement(activeList);
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
index 4a100a762..0f646f33a 100644
--- a/test/cypress/integration/zone/zoneWarehouse.spec.js
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -3,7 +3,7 @@ describe('ZoneWarehouse', () => {
Warehouse: { val: 'Warehouse One', type: 'select' },
};
- const dataError = 'ER_DUP_ENTRY: Duplicate entry';
+ const dataError = 'The introduced warehouse already exists';
const saveBtn = '.q-btn--standard > .q-btn__content > .block';
beforeEach(() => {
@@ -18,7 +18,7 @@ describe('ZoneWarehouse', () => {
cy.get(saveBtn).click();
cy.checkNotification(dataError);
});
-
+
it('should create & remove a warehouse', () => {
cy.addBtnClick();
cy.fillInForm(data);
diff --git a/test/cypress/storage/access/.keep b/test/cypress/storage/access/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/storage/dms/.keep b/test/cypress/storage/dms/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/storage/image/catalog/.keep b/test/cypress/storage/image/catalog/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/storage/image/user/.keep b/test/cypress/storage/image/user/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/storage/pdfs/invoice/.keep b/test/cypress/storage/pdfs/invoice/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/storage/tmp/.keep b/test/cypress/storage/tmp/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index aa4a1219e..bc8158b62 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -27,7 +27,9 @@
// DO NOT REMOVE
// Imports Quasar Cypress AE predefined commands
// import { registerCommands } from '@quasar/quasar-app-extension-testing-e2e-cypress';
-Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, require('./waitUntil'));
+import waitUntil from './waitUntil';
+Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, waitUntil);
+
Cypress.Commands.add('resetDB', () => {
cy.exec('pnpm run resetDatabase');
});
@@ -57,7 +59,7 @@ Cypress.Commands.add('login', (user) => {
Cypress.Commands.add('domContentLoad', (element, timeout = 5000) => {
cy.waitUntil(() => cy.document().then((doc) => doc.readyState === 'complete'));
});
-Cypress.Commands.add('waitForElement', (element, timeout = 5000) => {
+Cypress.Commands.add('waitForElement', (element, timeout = 10000) => {
cy.get(element, { timeout }).should('be.visible').and('not.be.disabled');
});
@@ -321,19 +323,14 @@ Cypress.Commands.add('clickButtonDescriptor', (id) => {
});
Cypress.Commands.add('openUserPanel', () => {
- cy.get(
- '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image',
- ).click();
+ cy.dataCy('userPanel_btn').click();
});
Cypress.Commands.add('checkNotification', (text) => {
- cy.get('.q-notification')
+ cy.get('.q-notification', { timeout: 10000 })
.should('be.visible')
- .last()
- .then(($lastNotification) => {
- if (!Cypress.$($lastNotification).text().includes(text))
- throw new Error(`Notification not found: "${text}"`);
- });
+ .filter((_, el) => Cypress.$(el).text().includes(text))
+ .should('have.length.greaterThan', 0);
});
Cypress.Commands.add('openActions', (row) => {
diff --git a/test/cypress/support/index.js b/test/cypress/support/index.js
index c57c1a303..075e0c8eb 100644
--- a/test/cypress/support/index.js
+++ b/test/cypress/support/index.js
@@ -27,7 +27,17 @@ function randomNumber(options = { length: 10 }) {
function randomizeValue(characterSet, options) {
return Array.from({ length: options.length }, () =>
- characterSet.charAt(Math.floor(Math.random() * characterSet.length))
+ characterSet.charAt(Math.floor(Math.random() * characterSet.length)),
).join('');
}
+
+const style = document.createElement('style');
+style.innerHTML = `
+ * {
+ transition: none !important;
+ animation: none !important;
+ }
+`;
+document.head.appendChild(style);
+
export { randomString, randomNumber, randomizeValue };
diff --git a/vitest.config.js b/vitest.config.js
index a465f0e2d..f856a1dc9 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -5,9 +5,21 @@ import jsconfigPaths from 'vite-jsconfig-paths';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path';
+let reporters,
+ outputFile;
+
+if (process.env.CI) {
+ reporters = ['junit', 'default'];
+ outputFile = {junit: './junit/vitest.xml'};
+} else {
+ reporters = 'default';
+}
+
// https://vitejs.dev/config/
export default defineConfig({
test: {
+ reporters,
+ outputFile,
environment: 'happy-dom',
setupFiles: 'test/vitest/setup-file.js',
include: [