diff --git a/cypress/e2e/brewery/ScenarioParametersValidation.cy.js b/cypress/e2e/brewery/ScenarioParametersValidation.cy.js index 4cfe83ea0..c524aea20 100644 --- a/cypress/e2e/brewery/ScenarioParametersValidation.cy.js +++ b/cypress/e2e/brewery/ScenarioParametersValidation.cy.js @@ -214,6 +214,21 @@ describe('scenario parameters inputs validation', () => { ScenarioParameters.getLaunchButton().should('not.be.disabled'); ScenarioParameters.discard(); }); + it('checks error message for invalid file format in file upload input', () => { + ScenarioParameters.expandParametersAccordion(); + BreweryParameters.switchToDatasetPartsTab(); + BreweryParameters.getExampleDatasetPart2ErrorMessage().should('not.exist'); + ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('0'); + BreweryParameters.uploadExampleDatasetPart2(invalidFormatFilePath); + BreweryParameters.getExampleDatasetPart2ErrorMessage().should('be.visible').contains('File format not supported'); + ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('1'); + ScenarioParameters.getSaveButton().should('be.disabled'); + ScenarioParameters.getLaunchButton().should('be.disabled'); + ScenarioParameters.discard(); + BreweryParameters.getExampleDatasetPart2ErrorMessage().should('not.exist'); + ScenarioParameters.getLaunchButton().should('not.be.disabled'); + ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('0'); + }); }); describe('validation with constraints between parameters', () => { @@ -236,6 +251,7 @@ describe('validation with constraints between parameters', () => { }); it('checks validation constraints', () => { ScenarioParameters.expandParametersAccordion(); + BreweryParameters.getStockInput().clear().type('4'); BreweryParameters.getRestockHelperText().should('exist').contains('strictly less than the field Stock'); BreweryParameters.getRestockInput().clear().type('1'); @@ -243,6 +259,7 @@ describe('validation with constraints between parameters', () => { BreweryParameters.getWaitersHelperText().should('exist').contains('less than or equal to the field Restock'); BreweryParameters.getWaitersInput().clear().type('1'); BreweryParameters.getWaitersHelperText().should('not.exist'); + BreweryParameters.switchToAdditionalParametersTab(); BreweryParameters.getStartDateInput().clear().type('02/22/2022'); BreweryParameters.getEndDateHelperText().should('exist').contains('strictly after'); @@ -259,21 +276,12 @@ describe('validation with constraints between parameters', () => { BreweryParameters.getAdditionalDateInput().clear().type('06/21/2022'); BreweryParameters.getAdditionalDateHelperText().should('not.exist'); ScenarioParameters.discard(); - }); - it('checks error message for invalid file format in file upload input', () => { - ScenarioParameters.expandParametersAccordion(); + BreweryParameters.switchToDatasetPartsTab(); - BreweryParameters.getExampleDatasetPart2ErrorMessage().should('not.exist'); - ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('0'); - BreweryParameters.uploadExampleDatasetPart2(invalidFormatFilePath); - BreweryParameters.getExampleDatasetPart2ErrorMessage().should('be.visible').contains('File format not supported'); - ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('1'); - ScenarioParameters.getSaveButton().should('be.disabled'); - ScenarioParameters.getLaunchButton().should('be.disabled'); - ScenarioParameters.discard(); - BreweryParameters.getExampleDatasetPart2ErrorMessage().should('not.exist'); - ScenarioParameters.getLaunchButton().should('not.be.disabled'); - ScenarioParameters.getTabsErrorBadge(BreweryParameters.getDatasetPartsTab()).contains('0'); + BreweryParameters.getCommentInput().clear().type('Good'); + BreweryParameters.getEvaluationHelperText().should('exist').contains('must be different from'); + BreweryParameters.getEvaluationInput().clear().type('Super'); + BreweryParameters.getEvaluationHelperText().should('not.exist'); }); }); diff --git a/cypress/fixtures/stubbing/ScenarioParametersValidation/solutions.js b/cypress/fixtures/stubbing/ScenarioParametersValidation/solutions.js index d2bdfa937..5efd4d919 100644 --- a/cypress/fixtures/stubbing/ScenarioParametersValidation/solutions.js +++ b/cypress/fixtures/stubbing/ScenarioParametersValidation/solutions.js @@ -218,17 +218,7 @@ const SOLUTION_WITH_CONSTRAINTS_BETWEEN_PARAMETERS = { varType: 'string', options: { minLength: 2, - }, - }, - { - ...SOLUTION_PARAMETER_EXAMPLE, - id: 'currency_name', - defaultValue: 'EUR', - labels: { fr: 'Nom de la monnaie', en: 'Currency name' }, - varType: 'string', - options: { - minLength: 2, - maxLength: 10, + validation: '!= comment', }, }, {