Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Points d'intérêt] – Supprimer les types de points, pouvoir masquer les points sur la carte, changer l'icone #1397

Merged
merged 14 commits into from
May 27, 2024
+723 −720
Merged

[Points d'intérêt] – Supprimer les types de points, pouvoir masquer les points sur la carte, changer l'icone #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b16b389
[feat] Suppression de la liste des types de points d'intérêt
maximeperrault May 16, 2024
5ad1686
[InterestPoint] clean style
claire2212 May 16, 2024
520f9cf
[feat] Changer la couleur des points sur la carte et nettoyage du cod…
maximeperrault May 17, 2024
ebdb8ad
feat: Pouvoir masquer/afficher tous les points d'intérêt
maximeperrault May 17, 2024
9f6e222
feat : correction du dépassement des observations
maximeperrault May 17, 2024
86f9329
[feat] Ajout du useEffect de type componentdidMount pour le drag&drop
maximeperrault May 21, 2024
9663536
[feat] Ajout du useEffect de type componentdidMount pour le drag&drop
maximeperrault May 21, 2024
139d9c5
[feat] Ajout du useEffect de type componentdidMount pour le drag&drop
maximeperrault May 21, 2024
f67b441
[feat] cleanup & refacto
maximeperrault May 21, 2024
d9ad798
[feat] Ajout et correction des tests e2e
maximeperrault May 21, 2024
f063a32
[fix] montée de version cypress (bug firefox résolu en 13.9.0)
maximeperrault May 23, 2024
fd0d4a9
mise en place de l'idempotence des tests e2e
maximeperrault May 23, 2024
0f5affc
[review] claire dagan's review check
maximeperrault May 24, 2024
fdab195
[review] fix tests e2e idempotent
maximeperrault May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions frontend/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,4 @@ FRONTEND_REPORTING_FORM_AUTO_UPDATE=true

FRONTEND_MONITORENV_VERSION=0.0.0

################################################################################
# MonitorFish
MONITORFISH_API_KEY=""
################################################################################
77 changes: 39 additions & 38 deletions frontend/cypress/e2e/back_office/administration_form.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,66 +31,67 @@ context('Back Office > Administration Form', () => {

cy.clickButton('Créer')

cy.wait('@createAdministration').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
cy.wait('@createAdministration').then(({ request, response }) => {
if (!response) {
assert.fail('response is undefined.')
}
const id = response.body.id

assert.deepEqual(interception.request.body, {
assert.deepEqual(request.body, {
isArchived: false,
name: 'Administration 1'
})
})

// -------------------------------------------------------------------------
// Edit
// -------------------------------------------------------------------------
// Edit

cy.intercept('PUT', `/api/v1/administrations/2007`).as('updateAdministration')
cy.intercept('PUT', `/api/v1/administrations/${id}`).as('updateAdministration')

cy.getTableRowById(2007).clickButton('Éditer cette administration')
cy.getTableRowById(id).clickButton('Éditer cette administration')

cy.fill('Nom', 'Administration 2')
cy.fill('Nom', 'Administration 2')

cy.clickButton('Mettre à jour')
cy.clickButton('Mettre à jour')

cy.wait('@updateAdministration').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
}
cy.wait('@updateAdministration').then(({ request: requestOfUpdate, response: responseOfUpdate }) => {
if (!responseOfUpdate) {
assert.fail('response is undefined.')
}

assert.deepInclude(interception.request.body, {
id: 2007,
isArchived: false,
name: 'Administration 2'
assert.deepInclude(requestOfUpdate.body, {
id,
isArchived: false,
name: 'Administration 2'
})
})
})

// -------------------------------------------------------------------------
// Archive
// -------------------------------------------------------------------------
// Archive

cy.intercept('PUT', `/api/v1/administrations/2007/archive`).as('archiveAdministration')
cy.intercept('PUT', `/api/v1/administrations/${id}/archive`).as('archiveAdministration')

cy.getTableRowById(2007).clickButton('Archiver cette administration')
cy.clickButton('Archiver')
cy.getTableRowById(id).clickButton('Archiver cette administration')
cy.clickButton('Archiver')

cy.wait('@archiveAdministration')
cy.wait('@archiveAdministration')

cy.getTableRowById(2007).should('not.exist')
cy.clickButton('Administrations archivées')
cy.getTableRowById(2007).should('exist')
cy.getTableRowById(id).should('not.exist')
cy.clickButton('Administrations archivées')
cy.getTableRowById(id).should('exist')

// -------------------------------------------------------------------------
// Delete
// -------------------------------------------------------------------------
// Delete

cy.intercept('DELETE', `/api/v1/administrations/2007`).as('deleteAdministration')
cy.intercept('DELETE', `/api/v1/administrations/${id}`).as('deleteAdministration')

cy.getTableRowById(2007).clickButton('Supprimer cette administration')
cy.clickButton('Supprimer')
cy.getTableRowById(id).clickButton('Supprimer cette administration')
cy.clickButton('Supprimer')

cy.wait('@deleteAdministration')
cy.wait('@deleteAdministration')

cy.getTableRowById(2007).should('not.exist')
cy.clickButton('Administrations actives')
cy.getTableRowById(2007).should('not.exist')
cy.getTableRowById(id).should('not.exist')
cy.clickButton('Administrations actives')
cy.getTableRowById(id).should('not.exist')
})
})
})
91 changes: 46 additions & 45 deletions frontend/cypress/e2e/back_office/control_unit_form.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,78 +38,79 @@ context('Back Office > Control Unit Form', () => {

cy.clickButton('Créer')

cy.wait('@createControlUnit').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
cy.wait('@createControlUnit').then(({ request, response }) => {
if (!response) {
assert.fail('response is undefined.')
}
const id = response.body.id

assert.deepEqual(interception.request.body, {
assert.deepEqual(request.body, {
administrationId: 1007,
areaNote: null,
departmentAreaInseeCode: '50',
isArchived: false,
name: 'Unité 1',
termsNote: null
})
})

// -------------------------------------------------------------------------
// Edit
// -------------------------------------------------------------------------
// Edit

cy.intercept('PUT', `/api/v2/control_units/10122`).as('updateControlUnit')
cy.intercept('PUT', `/api/v2/control_units/${id}`).as('updateControlUnit')

cy.getTableRowById(10122).clickButton('Éditer cette unité de contrôle')
cy.getTableRowById(id).clickButton('Éditer cette unité de contrôle')

expectPathToBe('/backoffice/control_units/10122')
expectPathToBe(`/backoffice/control_units/${id}`)

cy.fill('Administration', 'AFB')
cy.fill('Nom', 'Unité 2')
cy.fill('Département', 'Vendée')
cy.fill('Administration', 'AFB')
cy.fill('Nom', 'Unité 2')
cy.fill('Département', 'Vendée')

cy.clickButton('Mettre à jour')
cy.clickButton('Mettre à jour')

cy.wait('@updateControlUnit').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
}
cy.wait('@updateControlUnit').then(({ request: requestOfUpdate, response: responseOfUpdate }) => {
if (!responseOfUpdate) {
assert.fail('response is undefined.')
}

assert.deepInclude(interception.request.body, {
administrationId: 1002,
areaNote: null,
departmentAreaInseeCode: '85',
id: 10122,
isArchived: false,
name: 'Unité 2',
termsNote: null
assert.deepInclude(requestOfUpdate.body, {
administrationId: 1002,
areaNote: null,
departmentAreaInseeCode: '85',
id,
isArchived: false,
name: 'Unité 2',
termsNote: null
})
})
})

// -------------------------------------------------------------------------
// Archive
// -------------------------------------------------------------------------
// Archive

cy.intercept('PUT', `/api/v2/control_units/10122/archive`).as('archiveControlUnit')
cy.intercept('PUT', `/api/v2/control_units/${id}/archive`).as('archiveControlUnit')

cy.getTableRowById(10122).clickButton('Archiver cette unité de contrôle')
cy.clickButton('Archiver')
cy.getTableRowById(id).clickButton('Archiver cette unité de contrôle')
cy.clickButton('Archiver')

cy.wait('@archiveControlUnit')
cy.wait('@archiveControlUnit')

cy.getTableRowById(10122).should('not.exist')
cy.clickButton('Unités archivées')
cy.getTableRowById(10122).should('exist')
cy.getTableRowById(id).should('not.exist')
cy.clickButton('Unités archivées')
cy.getTableRowById(id).should('exist')

// -------------------------------------------------------------------------
// Delete
// -------------------------------------------------------------------------
// Delete

cy.intercept('DELETE', `/api/v2/control_units/10122`).as('deleteControlUnit')
cy.intercept('DELETE', `/api/v2/control_units/${id}`).as('deleteControlUnit')

cy.getTableRowById(10122).clickButton('Supprimer cette unité de contrôle')
cy.clickButton('Supprimer')
cy.getTableRowById(id).clickButton('Supprimer cette unité de contrôle')
cy.clickButton('Supprimer')

cy.wait('@deleteControlUnit')
cy.wait('@deleteControlUnit')

cy.getTableRowById(10122).should('not.exist')
cy.clickButton('Unités actives')
cy.getTableRowById(10122).should('not.exist')
cy.getTableRowById(id).should('not.exist')
cy.clickButton('Unités actives')
cy.getTableRowById(id).should('not.exist')
})
})
})
17 changes: 8 additions & 9 deletions frontend/cypress/e2e/back_office/station_form.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ context('Back Office > Station Form', () => {

cy.clickButton('Créer')

cy.wait('@createStation').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
cy.wait('@createStation').then(({ request, response }) => {
if (!response) {
assert.fail('response is undefined.')
}

assert.deepEqual(interception.request.body, {
assert.deepEqual(request.body, {
latitude: 1.2,
longitude: 3.4,
name: newBaseName
Expand All @@ -65,12 +64,12 @@ context('Back Office > Station Form', () => {

cy.clickButton('Mettre à jour')

cy.wait('@updateStation').then(interception => {
if (!interception.response) {
assert.fail('`interception.response` is undefined.')
cy.wait('@updateStation').then(({ request: requestOfUpdate, response: responseOfUpdate }) => {
if (!responseOfUpdate) {
assert.fail('response is undefined.')
}

assert.deepInclude(interception.request.body, {
assert.deepInclude(requestOfUpdate.body, {
latitude: 5.6,
longitude: 7.8,
name: nextBaseName
Expand Down
Loading
Loading