fix e2e

frontend/cypress/e2e/check-in.cy.ts

@@ -23,7 +23,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('Very important keyresult')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '51'
+        UNIT_PERCENT.unitName, '21', undefined, '51'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -48,7 +48,7 @@ describe('okr check-in', () => {
     overviewPage
       .addKeyResult()
       .fillKeyResultTitle('This key-result will have errors')
-      .withMetricValues(UNIT_NUMBER, '21', '51')
+      .withMetricValues(UNIT_NUMBER.unitName, '21', '51')
       .submit();
 
     const detailPage = keyResultDetailPage
@@ -71,7 +71,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('This keyresult is for the owner')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '51'
+        UNIT_PERCENT.unitName, '21', undefined, '51'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -121,7 +121,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('Very important keyresult')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '51'
+        UNIT_PERCENT.unitName, '21', undefined, '51'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -145,7 +145,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('This will not be good')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '52'
+        UNIT_PERCENT.unitName, '21', undefined, '52'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -191,7 +191,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('This will give a checkin list')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '52'
+        UNIT_PERCENT.unitName, '21', undefined, '52'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -230,7 +230,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('Here we edit a metric checkin')
       .withMetricValues(
-        UNIT_CHF, '10', undefined, '300'
+        UNIT_CHF.unitName, '10', undefined, '300'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -267,7 +267,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('A new KeyResult for checking checkin list')
       .withMetricValues(
-        UNIT_EUR, '10', undefined, '300'
+        UNIT_EUR.unitName, '10', undefined, '300'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -291,7 +291,7 @@ describe('okr check-in', () => {
       .addKeyResult()
       .fillKeyResultTitle('There is another kr with fte')
       .withMetricValues(
-        UNIT_FTE, '10', undefined, '300'
+        UNIT_FTE.unitName, '10', undefined, '300'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -351,7 +351,7 @@ describe('okr check-in', () => {
       .addKeyResult(undefined, 'draft objective title')
       .fillKeyResultTitle('I am a metric keyresult for testing')
       .withMetricValues(
-        UNIT_PERCENT, '21', undefined, '52'
+        UNIT_PERCENT.unitName, '21', undefined, '52'
       )
       .fillKeyResultDescription('This is my description')
       .submit();
@@ -376,7 +376,7 @@ describe('okr check-in', () => {
       .addKeyResult(undefined, objectiveName)
       .fillKeyResultTitle('I am a keyresult metric')
       .withMetricValues(
-        UNIT_PERCENT, '45', undefined, '60'
+        UNIT_PERCENT.unitName, '45', undefined, '60'
       )
       .fillKeyResultDescription('Description')
       .submit();
@@ -402,7 +402,7 @@ describe('okr check-in', () => {
     overviewPage.addKeyResult('Puzzle ITC', 'Wir wollen die Kundenzufriedenheit steigern')
       .fillKeyResultTitle(keyResultTitle)
       .withMetricValues(
-        UNIT_NUMBER, '1', undefined, '5'
+        UNIT_NUMBER.unitName, '1', undefined, '5'
       )
       .addActionPlanElement('First action')
       .addActionPlanElement('Second action')

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

@@ -112,7 +112,7 @@ describe('functionality of duplicating objectives and their belonging key-result
       .addKeyResult('LoremIpsum', objectiveTitle)
       .fillKeyResultTitle('A metric keyResult with lots of values')
       .withMetricValues(
-        UNIT_CHF, '1', undefined, '5'
+        UNIT_CHF.unitName, '1', undefined, '5'
       )
       .fillKeyResultDescription('Its very sunny today.')
       .addActionPlanElement('Action')

frontend/cypress/e2e/key-result.cy.ts

@@ -2,17 +2,18 @@ import * as users from '../fixtures/users.json';
 import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage';
 import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage';
 import KeyResultDialog from '../support/helper/dom-helper/dialogs/keyResultDialog';
+import { UNIT_CHF, UNIT_PERCENT } from '../../src/app/shared/test-data';
 
-let overviewPage = new CyOverviewPage();
-let keyResultDetailPage = new KeyResultDetailPage();
+describe('okr key-result', () => {
+  let overviewPage = new CyOverviewPage();
+  let keyResultDetailPage = new KeyResultDetailPage();
 
-beforeEach(() => {
-  overviewPage = new CyOverviewPage();
-  keyResultDetailPage = new KeyResultDetailPage();
-  cy.loginAsUser(users.gl);
-});
+  beforeEach(() => {
+    overviewPage = new CyOverviewPage();
+    keyResultDetailPage = new KeyResultDetailPage();
+    cy.loginAsUser(users.gl);
+  });
 
-describe('okr key-result', () => {
   it('should create new metric key-result', () => {
     const keyResultDialog = overviewPage
       .addKeyResult()
@@ -22,25 +23,25 @@ describe('okr key-result', () => {
       .fillKeyResultDescription('This is my description');
 
     keyResultDialog.withMetricValues(
-      'PERCENT', '999999999999999999999999999999', '7', undefined
+      UNIT_PERCENT.unitName, '999999999999999999999999999999', '7', undefined
     );
     keyResultDialog.checkOnDialog(() => cy.contains('Baseline darf maximal 20 Zeichen lang sein.'));
 
     keyResultDialog.withMetricValues(
-      'PERCENT', '0', '7', undefined
+      UNIT_PERCENT.unitName, '0', '7', undefined
     );
     cy.getByTestId('stretch-goal')
       .should('have.value', '10');
 
     keyResultDialog.withMetricValues(
-      'PERCENT', '0', undefined, '100'
+      UNIT_PERCENT.unitName, '0', undefined, '100'
     );
     cy.getByTestId('target-goal')
       .should('have.value', '70');
 
     keyResultDialog
       .withMetricValues(
-        'PERCENT', '21', undefined, '52'
+        UNIT_PERCENT.unitName, '21', undefined, '52'
       )
       .submit();
     keyResultDetailPage.visit('I am a metric keyresult');
@@ -92,7 +93,7 @@ describe('okr key-result', () => {
       .checkForDialogTextMetric()
       .fillKeyResultTitle('I am a metric keyresult with a new one')
       .withMetricValues(
-        'PERCENT', '21', undefined, '52'
+        UNIT_PERCENT.unitName, '21', undefined, '52'
       )
       .fillOwner('Bob Baumeister')
       .fillKeyResultDescription('This is my description when creating and then open a new')
@@ -176,7 +177,7 @@ describe('okr key-result', () => {
       .addKeyResult()
       .fillKeyResultTitle('We want not to change metric keyresult title')
       .withMetricValues(
-        'PERCENT', '0', undefined, '10'
+        UNIT_PERCENT.unitName, '0', undefined, '10'
       )
       .checkForDialogTextMetric()
       .fillKeyResultDescription('This is my description')
@@ -193,7 +194,7 @@ describe('okr key-result', () => {
       .checkOnDialog(() => cy.getByTestId('stretch-goal')
         .should('have.value', '10'))
       .withMetricValues(
-        'PERCENT', '0', '70', undefined
+        UNIT_PERCENT.unitName, '0', '70', undefined
       )
       .run(cy.getByTestId('ordinal-tab')
         .click())
@@ -206,7 +207,7 @@ describe('okr key-result', () => {
       .checkOnDialog(() => cy.getByTestId('stretch-goal')
         .should('have.value', '100'))
       .withMetricValues(
-        'PERCENT', '5', '8.5', undefined
+        UNIT_PERCENT.unitName, '5', '8.5', undefined
       )
       .checkOnDialog(() => cy.getByTestId('stretch-goal')
         .should('have.value', '10'))
@@ -250,7 +251,7 @@ describe('okr key-result', () => {
     KeyResultDialog.do()
       .fillKeyResultTitle('This is my new title for the new metric keyresult')
       .withMetricValues(
-        'PERCENT', '21', undefined, '56'
+        UNIT_PERCENT.unitName, '21', undefined, '56'
       )
       .fillKeyResultDescription('This is my new description')
       .submit();
@@ -330,15 +331,15 @@ describe('okr key-result', () => {
     KeyResultDialog.do()
       .fillKeyResultTitle('My title')
       .withMetricValues(
-        'CHF', 'abc', undefined, '123'
+        UNIT_CHF.unitName, 'abc', undefined, '123'
       );
     cy.getByTestId('submit')
       .should('be.disabled');
     cy.contains('Baseline muss eine Zahl sein.');
 
     KeyResultDialog.do()
       .withMetricValues(
-        'PERCENT', '45', undefined, '52'
+        UNIT_PERCENT.unitName, '45', undefined, '52'
       );
     cy.getByTestId('submit')
       .should('not.be.disabled');
@@ -350,15 +351,15 @@ describe('okr key-result', () => {
 
     KeyResultDialog.do()
       .withMetricValues(
-        'PERCENT', '45', undefined, 'abc'
+        UNIT_PERCENT.unitName, '45', undefined, 'abc'
       );
     cy.getByTestId('submit')
       .should('be.disabled');
     cy.contains('Stretch Goal muss eine Zahl sein.');
 
     KeyResultDialog.do()
       .withMetricValues(
-        'PERCENT', '45', undefined, '83'
+        UNIT_PERCENT.unitName, '45', undefined, '83'
       );
     cy.getByTestId('submit')
       .should('not.be.disabled');
@@ -467,37 +468,3 @@ describe('okr key-result', () => {
       .run(cy.buttonShouldBePrimary('submit'));
   });
 });
-
-describe('metric key-result edit units', () => {
-  it('should be able to add a custom unit and save it', () => {
-    overviewPage
-      .addKeyResult()
-      .fillKeyResultTitle('This key-result has a new value!')
-      .editMetricValue('Bitcoins', 0)
-      .withMetricValues(
-        'Bitcoins', '0', '7', '10'
-      )
-      .submit();
-
-    // Should does not work yet, once the value is displayed on the detail view of the key-result correctly this will work
-    overviewPage.getKeyResultByName('This key-result has a new value!')
-      .click()
-      .should('contain', 'Bitcoins');
-  });
-
-  it('should be able to edit a custom unit and save it', () => {
-    overviewPage
-      .getKeyResultByName('This key-result has a new value!')
-      .click();
-
-    keyResultDetailPage
-      .editKeyResult()
-      .editMetricValue('Dogecoin', 1)
-      .submit();
-  });
-
-  it('should not save the custom unit when the save button is not clicked', () => {
-
-  });
-});
-

frontend/cypress/e2e/scoring.cy.ts

@@ -120,7 +120,7 @@ function setupMetricKr(
     .addKeyResult()
     .fillKeyResultTitle(name)
     .withMetricValues(
-      UNIT_PERCENT, baseline.toString(), undefined, stretchGoal.toString()
+      UNIT_PERCENT.unitName, baseline.toString(), undefined, stretchGoal.toString()
     )
     .submit();
   KeyResultDetailPage.do()

frontend/cypress/e2e/tab.cy.ts

@@ -214,7 +214,7 @@ describe('tabbing workflows', () => {
       overviewPage
         .addOngoingKeyResult()
         .fillKeyResultTitle('A metric Keyresult for tabbing tests')
-        .withMetricValues(UNIT_CHF, '10', '100')
+        .withMetricValues(UNIT_CHF.unitName, '10', '100')
         .submit();
       KeyResultDetailPage.do()
         .visit('A metric Keyresult for tabbing tests');