Make command global and delete unused definitions of it

puzzle · Jan 22, 2025 · dd389b4 · dd389b4
1 parent 5f3ff49
commit dd389b4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 32 deletions.
diff --git a/frontend/cypress/e2e/check-in.cy.ts b/frontend/cypress/e2e/check-in.cy.ts
@@ -437,14 +437,14 @@ describe('okr check-in', () => {
   it('should have primary button on all check-in dialogs', () => {
     keyResultDetailPage.visit('Very important keyresult')
       .createCheckIn()
-      .checkForPrimaryButton('submit-check-in')
+      .run(cy.checkForPrimaryButton('submit-check-in'))
       .cancel();
 
     keyResultDetailPage
       .showAllCheckIns()
-      .checkForPrimaryButton('closeButton')
+      .run(cy.checkForPrimaryButton('closeButton'))
       .editLatestCheckIn()
-      .checkForPrimaryButton('submit-check-in')
+      .run(cy.checkForPrimaryButton('submit-check-in'))
       .cancel();
   });
 });

diff --git a/frontend/cypress/e2e/key-result.cy.ts b/frontend/cypress/e2e/key-result.cy.ts
@@ -362,13 +362,13 @@ describe('okr key-result', () => {
       .addKeyResult()
       .fillKeyResultTitle('A keyResult for testing purposes')
       .withOrdinalValues('My commit zone', 'My target zone', 'My stretch goal')
-      .checkForPrimaryButton('submit')
+      .run(cy.checkForPrimaryButton('submit'))
       .submit();
 
     keyResultDetailPage
       .visit('A keyResult for testing purposes')
       .editKeyResult()
-      .checkForPrimaryButton('submit')
+      .run(cy.checkForPrimaryButton('submit'))
       .cancel();
   });
 });
diff --git a/frontend/cypress/e2e/objective.cy.ts b/frontend/cypress/e2e/objective.cy.ts
@@ -271,45 +271,48 @@ describe('okr objective', () => {
       overviewPage
         .addObjective()
         .fillObjectiveTitle('A objective for testing purposes')
-        .checkForPrimaryButton('save-draft')
+        .run(cy.checkForPrimaryButton('save-draft'))
         .submit();
 
       overviewPage
         .openThreeDotMenuOfObjective('A objective for testing purposes')
         .selectFromThreeDotMenu('Objective bearbeiten');
       ObjectiveDialog.do()
-        .checkForPrimaryButton('save')
+        .run(cy.checkForPrimaryButton('save'))
         .cancel();
 
       overviewPage
         .openThreeDotMenuOfObjective('A objective for testing purposes')
         .selectFromThreeDotMenu('Objective abschliessen');
       cy.getByTestId('successful')
         .click();
-      cy.getByTestId('submit')
-        .should('have.attr', 'color', 'primary')
-        .and('have.attr', 'mat-flat-button');
+      cy.checkForPrimaryButton('submit');
       cy.getByTestId('cancel')
         .click();
 
       overviewPage
         .openThreeDotMenuOfObjective('A objective for testing purposes')
         .selectFromThreeDotMenu('Objective als Draft speichern');
       ConfirmDialog.do()
-        .checkForPrimaryButton()
+        .run(cy.checkForPrimaryButton('confirm-yes'))
         .cancel();
 
       overviewPage
         .openThreeDotMenuOfObjective('A objective for testing purposes')
         .selectFromThreeDotMenu('Objective löschen');
       ConfirmDialog.do()
-        .checkForPrimaryButton()
+        .run(cy.checkForPrimaryButton('confirm-yes'))
         .cancel();
 
       overviewPage
         .duplicateObjective('A objective for testing purposes')
-        .checkForPrimaryButton('save')
+        .run(cy.checkForPrimaryButton('save'))
         .cancel();
+
+      overviewPage
+        .getObjectiveByName('A objective for testing purposes')
+        .click();
+      cy.checkForPrimaryButton('add-key-result-objective-detail');
     });
   });
 

diff --git a/frontend/cypress/e2e/team-management.cy.ts b/frontend/cypress/e2e/team-management.cy.ts
@@ -356,19 +356,19 @@ describe('okr team-management', () => {
       teamManagementPage.elements.registerMember()
         .click();
       InviteMembersDialog.do()
-        .checkForPrimaryButton('invite')
+        .run(cy.checkForPrimaryButton('invite'))
         .close();
 
       teamManagementPage
         .addTeam()
-        .fillName('Our newest team')
-        .checkForPrimaryButton('save')
+        .fillName('Our newest team');
+      cy.checkForPrimaryButton('save')
         .submit();
       cy.wait('@addTeam');
 
       cy.getByTestId('editTeamButton')
         .click();
-      checkForPrimaryButton('save');
+      cy.checkForPrimaryButton('save');
       cy.getByTestId('cancel')
         .click();
 
@@ -379,7 +379,7 @@ describe('okr team-management', () => {
       cy.get('span')
         .contains('Paco Eggimann')
         .click();
-      checkForPrimaryButton('save');
+      cy.checkForPrimaryButton('save');
       cy.getByTestId('close-dialog')
         .click();
     });

diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts
@@ -75,6 +75,12 @@ Cypress.Commands.add('validateScoring', (isOverview: boolean, percentage: number
   validateScoring(isOverview, percentage);
 });
 
+Cypress.Commands.add('checkForPrimaryButton', (submitButtonId: string) => {
+  cy.getByTestId(submitButtonId)
+    .should('have.attr', 'color', 'primary')
+    .and('have.attr', 'mat-flat-button');
+});
+
 function loginWithCredentials(username: string, password: string) {
   cy.visit('/');
   cy.intercept('GET', '**/users/current')

diff --git a/frontend/cypress/support/component.ts b/frontend/cypress/support/component.ts
@@ -7,6 +7,7 @@ declare global {
       loginAsUser(user: any): Chainable;
       logout(): void;
       getByTestId(testsId: string, text?: string): Chainable;
+      checkForPrimaryButton(submitButtonId: string): Chainable;
       findByTestId(testId: string, text?: string): Chainable;
       pressUntilContains(text: string, key: keyof typeof keyCodeDefinitions): void;
       tabForward(): void;

diff --git a/frontend/cypress/support/helper/dom-helper/dialogs/confirmDialog.ts b/frontend/cypress/support/helper/dom-helper/dialogs/confirmDialog.ts
@@ -19,13 +19,6 @@ export default class ConfirmDialog extends Dialog {
       .click();
   }
 
-  checkForPrimaryButton() {
-    cy.getByTestId('confirm-yes')
-      .should('have.attr', 'color', 'primary')
-      .and('have.attr', 'mat-flat-button');
-    return this;
-  }
-
   getPage(): Chainable {
     return cy.get('app-confirm-dialog');
   }

diff --git a/frontend/cypress/support/helper/dom-helper/dialogs/dialog.ts b/frontend/cypress/support/helper/dom-helper/dialogs/dialog.ts
@@ -33,13 +33,6 @@ export default abstract class Dialog extends PageObjectMapperBase {
       .click();
   }
 
-  checkForPrimaryButton(submitButtonId: string) {
-    cy.getByTestId(submitButtonId)
-      .should('have.attr', 'color', 'primary')
-      .and('have.attr', 'mat-flat-button');
-    return this;
-  }
-
   protected fillInputByTestId(testId: string, value: string) {
     const elem = cy.getByTestId(testId);
     this.fillInput(elem, value);