Merge branch 'develop' into feat/ff-invitation-page#1477

Author: Jeremy-Bojko

frontend_tests/cypress/e2e/auth/advisorSignup.cy.js

@@ -6,8 +6,8 @@ describe('Signup advisor @demande-compte-conseiller', () => {
     '[name=organization_position]': 'Tester',
     '[name=email]': 'signup4@success.test',
     '[name=phone_no]': '0102030405',
-    '[name=password1]': 'derpderp',
-    '[name=password2]': 'derpderp',
+    '[name=password1]': 'Coco2000',
+    '[name=password2]': 'Coco2000',
   };
 
   it('signup a new advisor', function () {

frontend_tests/cypress/e2e/auth/loginWithUi.cy.js

@@ -19,8 +19,8 @@ describe('The Login Page', () => {
       .should('have.value', username);
 
     cy.get('#id_password')
-      .type('derpderp', { force: true })
-      .should('have.value', 'derpderp');
+      .type('Coco2000', { force: true })
+      .should('have.value', 'Coco2000');
 
     cy.get('[type=submit]').click({ force: true });
 

frontend_tests/cypress/e2e/auth/signupWithUi.cy.js

@@ -6,8 +6,8 @@ describe('The Signup Page', () => {
     '[name=organization_position]': 'Tester',
     '[name=email]': 'signup3@success.test',
     '[name=phone_no]': '0102030405',
-    '[name=password1]': 'derpderp',
-    '[name=password2]': 'derpderp',
+    '[name=password1]': 'Coco2000',
+    '[name=password2]': 'Coco2000',
   };
 
   it('signup a new user', function () {

frontend_tests/cypress/e2e/project/multiportail/canViewProjectShareBetweenPortal.cy.js

@@ -18,14 +18,6 @@ describe('Project share between portal', () => {
       .should('include.text', 'example2');
   });
 
-  it('display share by and with portal on list advisor dashboard', () => {
-    cy.login('staff'); // TODO replace by staffOnSite and check behaviour
-    cy.visit('/projects/advisor');
-    cy.get('[data-cy="list-project-shared-by-origin"]')
-      .should('be.visible')
-      .should('include.text', 'example2');
-  });
-
   it('display current portal EDL first', () => {
     cy.login('collectivité1');
     cy.visit('/project/23/connaissance');

frontend_tests/cypress/e2e/project/staff/canApproveAProject.cy.js

@@ -9,7 +9,7 @@ describe('I can go to the dashboard and see the pending projects, and approve on
       .closest("[data-test-id='project-card']")
       .find('[data-test-id="accept-project"]')
       .contains('Accepter')
-      .click();
+      .click({ force: true });
 
     cy.url().should('include', '/project/');
     cy.contains('Friche numéro 4');

frontend_tests/cypress/e2e/project/tasks/canPublishTaskWithRessource.cy.js

@@ -1,7 +1,13 @@
 describe('I can attach miscellanious ressource to task @page-projet-recommandations-creation', () => {
   it('publishes a task with resource comment / no comment', () => {
     cy.login('conseiller1');
-    cy.visit(`/projects/action/?project_id=25`);
+    cy.visit('/project/1');
+    cy.visit('/project/25');
+
+    cy.visit(`/projects/action/?resource_id=2`);
+    cy.get('[data-cy="reco-pusher-selected-project"]').contains(
+      'commune de test - Projet avec une reco qui a une resource qui a des contacts'
+    );
 
     cy.get('[data-cy="radio-push-reco-single-resource"]').should('be.checked');