🔖 Release 2.33.0 (#1307)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Benjamin Arias <12382534+bjlaa@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Souche <paul@bettercallpaul.fr>
Co-authored-by: Clément <55186402+Clemog@users.noreply.github.com>
Co-authored-by: Clément <clem.auger@hotmail.fr>
Co-authored-by: Bot Incubateur Ademe <153178900+incubateur-ademe-admin@users.noreply.github.com>

Author: 5 people

.github/workflows/e2e.yaml

@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - preprod
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to test'
+        required: true
+        type: string
 
 jobs:
   e2e:
@@ -19,16 +25,41 @@ jobs:
       - name: Install dependencies
         run: yarn install
 
+      # - name: Generate E2E test specs from personas
+      #   run: yarn e2e:generate
+
       - name: Get PR number for non-main/preprod branches
-        if: ${{ github.event.inputs.branch != 'main' && github.event.inputs.branch != 'preprod' }}
+        if: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.branch != 'preprod') || (github.event_name == 'push' && github.ref != 'refs/heads/preprod') || (github.event_name == 'pull_request' && github.head_ref != 'preprod') }}
         id: pr
         uses: actions/github-script@v7
         with:
           script: |
+            // For workflow_dispatch events, we need to find the PR for the specified branch
+            if (context.eventName === 'workflow_dispatch') {
+              const prs = await github.rest.pulls.list({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                head: context.repo.owner + ':' + '${{ github.event.inputs.branch }}',
+                sort: 'created',
+                direction: 'desc'
+              });
+              if (prs.data.length > 0) {
+                return prs.data[0].number;
+              }
+              return '';
+            }
+            // For pull_request events, we can get the PR number directly
+            if (context.payload.pull_request) {
+              return context.payload.pull_request.number;
+            }
+            // Fallback: try to find PR by current branch
+            const currentBranch = context.ref.replace('refs/heads/', '');
             const prs = await github.rest.pulls.list({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              head: context.repo.owner + ':' + '${{ github.event.inputs.branch }}'
+              head: context.repo.owner + ':' + currentBranch,
+              sort: 'created',
+              direction: 'desc'
             });
             if (prs.data.length > 0) {
               return prs.data[0].number;
@@ -38,9 +69,9 @@ jobs:
       - name: Set test URL
         id: set-url
         run: |
-          if [ "${{ github.event.inputs.branch }}" = "main" ]; then
-            echo "TEST_URL=https://nosgestesclimat.fr" >> $GITHUB_ENV
-          elif [ "${{ github.event.inputs.branch }}" = "preprod" ]; then
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ "${{ github.event.inputs.branch }}" = "preprod" ]; then
+            echo "TEST_URL=https://preprod.nosgestesclimat.fr" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" = "push" ] && [ "${{ github.ref }}" = "refs/heads/preprod" ]; then
             echo "TEST_URL=https://preprod.nosgestesclimat.fr" >> $GITHUB_ENV
           else
             PR_NUMBER=${{ steps.pr.outputs.result }}

.github/workflows/iframe-healthcheck.yaml

@@ -5,8 +5,6 @@ permissions:
 on:
   schedule:
     - cron: '0 5 * * *' # Runs at 5:00 AM UTC
-    - cron: '0 14 * * *' # Runs at 2:00 PM UTC
-    - cron: '0 17 * * *' # Runs at 5:00 PM UTC
   workflow_dispatch:
     inputs:
       branch:

.gitignore

@@ -68,4 +68,3 @@ coverage
 .husky/pre-push-custom
 
 *.log
-

cypress/constants/elements-ids.js

@@ -47,5 +47,6 @@ export const ORGANISATION_PAGE_SEE_PARAMETERS_BUTTON =
   'organisation-page-see-parameters-button'
 export const ORGANISATION_ADMINISTRATOR_POSITION_INPUT =
   'organisation-administrator-position-input'
-export const CAR_OPTION_20_000_KM = 'suggestion-20000'
+export const CAR_TYPE_INPUT =
+  'transport . voiture . utilisateur-propriétaire-label'
 export const QUESTION_LABEL = 'question-label'

cypress/e2e/integration/accessibility/static-pages.cy.js

@@ -1,5 +1,7 @@
 import 'cypress-axe'
 import { checkA11y } from '../../../helpers/accessibility/checkA11y'
+import { dismissCookieBanner } from '../../../helpers/cookies/dismissCookieBanner'
+import { visit } from '../../../helpers/interactions/visit'
 
 // Define the pages to test
 const staticPagesToTest = [
@@ -42,21 +44,26 @@ describe('Accessibility Tests', () => {
       cy.viewport('iphone-6')
 
       // Visit the page
-      cy.visit(page)
+      visit(page)
 
       // Wait for the page to load completely
       cy.wait(800)
       cy.injectAxe()
 
       // Run accessibility checks
       checkA11y()
+
+      dismissCookieBanner()
+
+      // Run accessibility checks after dismissing the cookie banner
+      checkA11y()
     })
 
     it(`Should have no accessibility violations on ${page} on desktop`, () => {
       cy.intercept({ resourceType: /xhr|fetch|uncaught/ }, { log: false })
 
       // Visit the page
-      cy.visit(page)
+      visit(page)
 
       // Wait for the page to load completely
       cy.wait(800)

cypress/e2e/integration/features/i18n-middleware.cy.js

@@ -1,6 +1,6 @@
 import {
   BACK_BUTTON,
-  CAR_OPTION_20_000_KM,
+  CAR_TYPE_INPUT,
   QUESTION_LABEL,
   SAVE_MODAL_EMAIL_INPUT,
   SAVE_MODAL_SUBMIT_BUTTON,
@@ -34,7 +34,7 @@ describe('Loading the simulation from the sid parameter', () => {
             initialValue = text
           })
 
-        click(CAR_OPTION_20_000_KM)
+        click(CAR_TYPE_INPUT)
         clickNextButton()
         click(BACK_BUTTON)
 
@@ -52,7 +52,7 @@ describe('Loading the simulation from the sid parameter', () => {
         beforeEach(() => {
           cy.clearLocalStorage()
 
-          cy.visit(`/simulateur/bilan?sid=${simulationId}`)
+          visit(`/simulateur/bilan?sid=${simulationId}`)
         })
 
         it('then it should load the simulation with the correct total footprint number', () => {

cypress/e2e/integration/features/lang-search-params.cy.js

@@ -1,3 +1,5 @@
+import { visit } from '../../../helpers/interactions/visit'
+
 describe('404 Page', () => {
   it('should display 404 page when accessing non-existent URL', () => {
     // Intercept and handle the Next.js not found error
@@ -8,10 +10,10 @@ describe('404 Page', () => {
     })
 
     // Visit a URL that definitely doesn't exist
-    cy.visit('/definitely-not-a-page-url', { failOnStatusCode: false })
+    visit('/definitely-not-a-page-url', { failOnStatusCode: false })
 
     // Verify that we're on the 404 page
-    cy.url().should('include', '/definitely-not-a-page-url')
+    cy.url().should('include', '/404')
 
     // Check for common 404 page elements
     cy.get('h1').should('exist')

cypress/e2e/integration/features/load-simulation-from-sid-parameter.cy.js

@@ -1,5 +1,6 @@
 import 'cypress-axe'
-import { skipTutoIfExists } from '../../../helpers/elements/buttons'
+import { dismissCookieBanner } from '../../../helpers/cookies/dismissCookieBanner'
+import { visit } from '../../../helpers/interactions/visit'
 import { recursivelyFillSimulation } from '../../../helpers/simulation/recursivelyFillSimulation'
 import { setupSimulation } from '../../../helpers/simulation/setupSimulation'
 
@@ -15,34 +16,36 @@ describe('Action userflow', () => {
         cy.intercept({ resourceType: /xhr|fetch|uncaught/ }, { log: false })
 
         // Actions when user hasn't completed the simulation
-        cy.visit('/actions')
+        visit('/actions')
 
         cy.wait(2000)
 
+        dismissCookieBanner()
+
         cy.get('h1')
           .contains(
             Cypress.env('testLangURL') === 'en' ? 'My gestures' : 'Mes gestes'
           )
           .should('be.visible')
 
-        // checkA11y() // TODO: fix A11Y test breaking only when running on CI
-
         // Actions when user has completed the simulation
-        cy.visit('/')
+        visit('/')
 
         setupSimulation()
 
         recursivelyFillSimulation()
 
-        skipTutoIfExists()
-
         cy.wait(4000)
 
-        cy.visit('/actions')
+        visit('/actions')
 
         cy.wait(2000)
 
-        // checkA11y() // TODO: fix A11Y test breaking only when running on CI
+        cy.get('h1')
+          .contains(
+            Cypress.env('testLangURL') === 'en' ? 'My gestures' : 'Mes gestes'
+          )
+          .should('be.visible')
       })
     })
   })