Merge pull request #1461 from navikt/cypress-mock-fix

Cypress mock fix

Author: lotorvik

packages/fyllut/cypress.config.ts

@@ -12,6 +12,7 @@ export default defineConfig({
       AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: 'http://127.0.0.1:3300/azure-openid/oauth2/v2.0/token',
       FORMIO_PROJECT_URL: 'http://127.0.0.1:3300/formio-api',
       SEND_INN_HOST: 'http://127.0.0.1:3300/send-inn',
+      SEND_INN_FRONTEND: 'http://localhost:3300/send-inn-frontend',
       TOKEN_X_WELL_KNOWN_URL: 'http://127.0.0.1:3300/tokenx/.well-known',
       BASE_URL: 'http://localhost:3001',
     },

packages/fyllut/cypress/cypress.d.ts

@@ -21,6 +21,8 @@ declare global {
 
       clickStart(): Chainable<JQuery<HTMLElement>>;
 
+      verifySendInnRedirect(): Chainable<JQuery<HTMLElement>>;
+
       defaultIntercepts(): Cypress.Chainable<JQuery<HTMLElement>>;
 
       defaultInterceptsMellomlagring(): Chainable<JQuery<HTMLElement>>;

packages/fyllut/cypress/e2e/components/activities.cy.ts

@@ -149,7 +149,7 @@ describe('Activities', () => {
       // Submit
       cy.clickSaveAndContinue();
       cy.wait('@submitMellomlagring');
-      cy.url().should('include', '/send-inn-frontend');
+      cy.verifySendInnRedirect();
     });
 
     describe('saved application', () => {
@@ -202,7 +202,7 @@ describe('Activities', () => {
           // Submit
           cy.clickSaveAndContinue();
           cy.wait('@submitMellomlagring');
-          cy.url().should('include', '/send-inn-frontend');
+          cy.verifySendInnRedirect();
         });
 
         it('should allow user to change chosen activity and update selected maalgruppe to reflect that', () => {
@@ -246,7 +246,7 @@ describe('Activities', () => {
           // Submit
           cy.clickSaveAndContinue();
           cy.wait('@submitMellomlagring');
-          cy.url().should('include', '/send-inn-frontend');
+          cy.verifySendInnRedirect();
         });
       });
     });
@@ -323,7 +323,7 @@ describe('Activities', () => {
       // Submit
       cy.clickSaveAndContinue();
       cy.wait('@submitMellomlagring');
-      cy.url().should('include', '/send-inn-frontend');
+      cy.verifySendInnRedirect();
     });
 
     it('should default to ANNET for maalgruppe', () => {
@@ -359,7 +359,7 @@ describe('Activities', () => {
       // Submit
       cy.clickSaveAndContinue();
       cy.wait('@submitMellomlagring');
-      cy.url().should('include', '/send-inn-frontend');
+      cy.verifySendInnRedirect();
     });
   });
 

packages/fyllut/cypress/e2e/digital-submission/mellomlagring.cy.ts

@@ -207,9 +207,9 @@ describe('Mellomlagring', () => {
           cy.wait('@getMellomlagringValid');
           cy.findByRole('heading', { name: TEXTS.statiske.summaryPage.title }).should('exist');
           cy.findByText('Ønsker du å få gaven innpakket').should('exist');
-          cy.findByRole('button', { name: TEXTS.grensesnitt.navigation.saveAndContinue }).should('exist').click();
+          cy.clickSaveAndContinue();
           cy.wait('@submitMellomlagring');
-          cy.url().should('not.include', 'testmellomlagring').should('include', '/send-inn-frontend');
+          cy.verifySendInnRedirect();
         });
 
         it('retrieves mellomlagring and lets you navigate to first empty panel', () => {
@@ -248,7 +248,7 @@ describe('Mellomlagring', () => {
             .should('exist')
             .within(() => {
               cy.get('a').should('have.length', 2);
-              cy.findByRole('link', { name: 'Du må fylle ut: Farge' }).should('exist').click();
+              cy.findByRole('link', { name: 'Du må fylle ut: Farge' }).should('exist').click({ force: true });
             });
 
           cy.findByRole('group', { name: 'Farge' })
@@ -262,7 +262,7 @@ describe('Mellomlagring', () => {
             .should('exist')
             .within(() => {
               cy.get('a').should('have.length', 1);
-              cy.findByRole('link', { name: 'Du må fylle ut: Tekst på kortet' }).should('exist').click();
+              cy.findByRole('link', { name: 'Du må fylle ut: Tekst på kortet' }).should('exist').click({ force: true });
             });
           cy.findByLabelText('Tekst på kortet').should('have.focus').type('Takk for hjelpen!');
 
@@ -336,7 +336,7 @@ describe('Mellomlagring', () => {
           cy.wait('@getMellomlagringValid');
           cy.findByRole('heading', { name: TEXTS.statiske.summaryPage.title }).should('exist');
           cy.findByText('Ønsker du å få gaven innpakket').should('exist');
-          cy.findByRole('button', { name: TEXTS.grensesnitt.navigation.saveAndContinue }).click();
+          cy.clickSaveAndContinue();
           cy.wait('@submitMellomlagring');
         });
       });

packages/fyllut/cypress/e2e/form/focus-handling.cy.ts

@@ -120,7 +120,7 @@ describe('Focus handling', () => {
         .should('exist')
         .within(() => {
           cy.findByRole('link', { name: 'Du må fylle ut: Hvilken type bolig bor du i?' }).should('exist');
-          cy.findByRole('link', { name: 'Du må fylle ut: Hvilken type bolig bor du i?' }).click();
+          cy.findByRole('link', { name: 'Du må fylle ut: Hvilken type bolig bor du i?' }).click({ force: true });
         });
 
       cy.findByRole('group', { name: 'Hvilken type bolig bor du i?' })
@@ -135,7 +135,7 @@ describe('Focus handling', () => {
         .should('exist')
         .within(() => {
           cy.findByRole('link', { name: 'Du må fylle ut: Mottakers fornavn' }).should('exist');
-          cy.findByRole('link', { name: 'Du må fylle ut: Mottakers fornavn' }).click();
+          cy.findByRole('link', { name: 'Du må fylle ut: Mottakers fornavn' }).click({ force: true });
         });
       cy.findByRole('textbox', { name: 'Mottakers fornavn' }).should('have.focus').type('Max');
 

packages/fyllut/cypress/e2e/pdf/digital-submission-pdf.cy.ts

@@ -108,7 +108,7 @@ describe('Pdf when digital submission', () => {
       cy.clickSaveAndContinue();
       // When failure, see mocks/routes/skjemabygging-proxy.js where the html content is verified (id='verify-nav111221b-nb')
       cy.wait('@submitMellomlagring');
-      cy.url().should('include', '/send-inn-frontend');
+      cy.verifySendInnRedirect();
     });
 
     it('nynorsk', () => {
@@ -203,7 +203,7 @@ describe('Pdf when digital submission', () => {
       cy.clickSaveAndContinue();
       // When failure, see mocks/routes/skjemabygging-proxy.js where the html content is verified (id='verify-nav111221b-nn')
       cy.wait('@submitMellomlagring');
-      cy.url().should('include', '/send-inn-frontend');
+      cy.verifySendInnRedirect();
     });
   });
 });

packages/fyllut/cypress/support/commands.ts

@@ -60,6 +60,12 @@ Cypress.Commands.add('clickStart', () => {
   return cy.findByRoleWhenAttached('link', { name: TEXTS.grensesnitt.introPage.start }).click();
 });
 
+Cypress.Commands.add('verifySendInnRedirect', () => {
+  return cy.origin(Cypress.env('SEND_INN_FRONTEND'), () => {
+    cy.contains('Send Inn Frontend');
+  });
+});
+
 Cypress.Commands.add('defaultIntercepts', () => {
   cy.intercept('POST', '/fyllut/api/log*', { body: 'ok' }).as('logger');
   cy.intercept('GET', '/fyllut/api/config*').as('getConfig');