Use aliases to remove unsafe chainings in cypress tests

frontend/cypress.config.ts

@@ -5,6 +5,8 @@ export default defineConfig({
     baseUrl: 'http://pitc.okr.localhost:4200',
     experimentalMemoryManagement: true,
     testIsolation: true,
+    viewportWidth: 1920,
+    viewportHeight: 1080,
   },
   env: {
     login_url: 'http://localhost:8544',

frontend/cypress/e2e/crud.cy.ts

@@ -18,8 +18,9 @@ describe('CRUD operations', () => {
       op.addObjective().fillObjectiveTitle(objectiveTitle).selectQuarter('3');
       cy.getByTestId(buttonTestId).click();
       cy.visit('/?quarter=3');
-      const objective = op.getObjectiveByName(objectiveTitle);
-      objective.findByTestId('objective-state').should('have.attr', 'src', `assets/icons/${icon}`);
+      op.getObjectiveByName(objectiveTitle)
+        .findByTestId('objective-state')
+        .should('have.attr', 'src', `assets/icons/${icon}`);
     });
   });
 

frontend/cypress/e2e/duplicated-scoring.cy.ts

@@ -37,12 +37,12 @@ describe('e2e test for scoring adjustment on objective duplicate', () => {
       .submit();
     cy.visit('/?quarter=3');
 
-    const failArea = op
-      .getKeyResultByName('stretch keyresult for testing')
+    op.getKeyResultByName('stretch keyresult for testing')
       .findByTestId('scoring-component')
-      .findByTestId('fail');
+      .findByTestId('fail')
+      .as('fail-area');
 
-    failArea.should(($fail) => {
+    cy.get('@fail-area').should(($fail) => {
       expect($fail).not.to.have.css('score-red');
       expect($fail).not.to.have.css('score-yellow');
       expect($fail).not.to.have.css('score-green');

frontend/cypress/e2e/objective-backlog.cy.ts

@@ -56,7 +56,9 @@ describe('OKR Objective Backlog e2e tests', () => {
     op.selectFromThreeDotMenu('Objective veröffentlichen');
 
     cy.contains('Objective veröffentlichen');
-    cy.getByTestId('title').first().clear().type('This is our first released objective');
+    cy.getByTestId('title').first().as('title');
+    cy.get('@title').clear();
+    cy.get('@title').type('This is our first released objective');
 
     cy.get('select#quarter').should('not.contain', 'Backlog');
     cy.get('select#quarter').select('GJ ForTests');

frontend/cypress/e2e/objective.cy.ts

@@ -176,17 +176,20 @@ describe('OKR Objective e2e tests', () => {
       cy.contains('Search after this objective');
       cy.contains('We dont want to search for this').should('not.exist');
 
-      cy.getByTestId('objectiveSearch').first().clear().type('this').wait(350);
+      cy.getByTestId('objectiveSearch').first().as('objective-search').clear();
+      cy.get('@objective-search').type('this').wait(350);
 
       cy.contains('Search after this objective');
       cy.contains('We dont want to search for this');
 
-      cy.getByTestId('objectiveSearch').first().clear().type('dont want to').wait(350);
+      cy.get('@objective-search').clear();
+      cy.get('@objective-search').type('dont want to').wait(350);
 
       cy.contains('We dont want to search for this');
       cy.contains('Search after this objective').should('not.exist');
 
-      cy.getByTestId('objectiveSearch').first().clear().type('there is no objective').wait(350);
+      cy.get('@objective-search').clear();
+      cy.get('@objective-search').type('there is no objective').wait(350);
 
       cy.contains('We dont want to search for this').should('not.exist');
       cy.contains('Search after this objective').should('not.exist');

frontend/cypress/e2e/teammanagement.cy.ts

@@ -183,7 +183,6 @@ describe('Team management tests', () => {
           .addAnotherUser()
           .enterUser('Stefan', 'Schmidt', '[email protected]')
           .addAnotherUser()
-
           .getFirstNames();
 
         // test error messages
@@ -331,7 +330,8 @@ describe('Team management tests', () => {
       cy.get(matOption).contains(nameEsha).should('not.exist');
 
       // add findus peterson
-      cy.getByTestId('search-member-to-add').click().type('Find');
+      cy.getByTestId('search-member-to-add').as('member-search').click();
+      cy.get('@member-search').type('Find');
       cy.contains(matOption, 'Findus Peterson').click();
 
       // add robin papierer
@@ -436,7 +436,9 @@ function checkRolesForEsha() {
 function editTeamNameAndTest(teamName: string) {
   cy.intercept('PUT', '**/teams/*').as('saveTeam');
   cy.getByTestId('editTeamButton').click();
-  cy.getByTestId('add-team-name').click().clear().type(teamName);
+  cy.getByTestId('add-team-name').as('team-name').click();
+  cy.get('@team-name').clear();
+  cy.get('@team-name').type(teamName);
   cy.getByTestId('safe').click();
   cy.wait('@saveTeam');
   cy.contains(teamName);

frontend/cypress/support/commands.ts

@@ -3,30 +3,30 @@ import { keyCodeDefinitions } from 'cypress-real-events/keyCodeDefinitions';
 import { pressUntilContains, doUntilSelector } from './helper/utils';
 
 Cypress.Commands.add('loginAsUser', (user: any) => {
-  cy.viewport(1920, 1080);
   loginWithCredentials(user.username, user.password);
   overviewIsLoaded();
 });
 
 Cypress.Commands.add('getByTestId', (testId: string, text?: string): Cypress.Chainable<JQuery<HTMLElement>> => {
   const selector = `[data-testId=${testId}]`;
-  const element = cy.get(selector);
+
   if (text) {
-    element.contains(text);
+    return cy.get(selector).contains(text);
+  } else {
+    return cy.get(selector);
   }
-  return element;
 });
 
 Cypress.Commands.add(
   'findByTestId',
   { prevSubject: true },
   (subject: JQuery<HTMLElement>, testId: string, text?: string): Cypress.Chainable<JQuery<HTMLElement>> => {
     const selector = `[data-testId=${testId}]`;
-    const element = cy.wrap(subject).find(selector);
     if (text) {
-      element.contains(text);
+      return cy.wrap(subject).find(selector).contains(text);
+    } else {
+      return cy.wrap(subject).find(selector);
     }
-    return element;
   },
 );