Skip to content

Commit 6626333

Browse files
renemadsenrenemadsen
committed
Fxing more tests.
1 parent 328b12e commit 6626333

File tree

4 files changed

+37
-15
lines changed

4 files changed

+37
-15
lines changed

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/d/task-wizard.copy.cy.ts‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,12 @@ describe('Area rules type 1', () => {
128128
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
129129
cy.get('.cdk-row .cdk-column-startDate span')
130130
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
131-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
132-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Aktiv');
131+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
132+
.invoke('text')
133+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
134+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
135+
.invoke('text')
136+
.should('eq', 'Aktiv');
133137
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
134138

135139
// Copy task
@@ -152,10 +156,18 @@ describe('Area rules type 1', () => {
152156
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
153157
cy.get('.cdk-row .cdk-column-startDate span').eq(1)
154158
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
155-
cy.get('.cdk-row .cdk-column-repeat span').eq(0).should('have.text', `${task.repeatEvery} ${task.repeatType}`);
156-
cy.get('.cdk-row .cdk-column-repeat span').eq(1).should('have.text', `${task.repeatEvery} ${task.repeatType}`);
157-
cy.get('.cdk-row .cdk-column-status span').eq(0).should('have.text', 'Aktiv');
158-
cy.get('.cdk-row .cdk-column-status span').eq(1).should('have.text', 'Aktiv');
159+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
160+
.eq(0).invoke('text')
161+
.should('have.text', `${task.repeatEvery} ${task.repeatType}`);
162+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
163+
.eq(1).invoke('text')
164+
.should('have.text', `${task.repeatEvery} ${task.repeatType}`);
165+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
166+
.eq(0).invoke('text')
167+
.should('have.text', 'Aktiv');
168+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
169+
.eq(1).invoke('text')
170+
.should('have.text', 'Aktiv');
159171
cy.get('.cdk-row .cdk-column-assignedTo span').eq(0).should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
160172
cy.get('.cdk-row .cdk-column-assignedTo span').eq(1).should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
161173

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-assignment.spec.cy.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ describe('Area rules type 1', () => {
132132
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
133133
cy.get('.cdk-row .cdk-column-startDate span')
134134
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
135-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
136-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Aktiv');
135+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
136+
.invoke('text')
137+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
138+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
139+
.invoke('text')
140+
.should('eq', 'Aktiv');
137141
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
138142
/* ==== Generated with Cypress Studio ==== */
139143
cy.get('#mat-expansion-panel-header-2 > .mat-content').click();

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-frequency.spec.cy.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,12 @@ describe('Area rules type 1', () => {
129129
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
130130
cy.get('.cdk-row .cdk-column-startDate span')
131131
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
132-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
133-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Aktiv');
132+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
133+
.invoke('text')
134+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
135+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
136+
.invoke('text')
137+
.should('eq', 'Aktiv');
134138
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
135139
// edit task
136140
cy.get('#advanced').click();
@@ -165,8 +169,12 @@ describe('Area rules type 1', () => {
165169
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
166170
cy.get('.cdk-row .cdk-column-startDate span')
167171
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
168-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
169-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Ikke aktiv');
172+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
173+
.invoke('text')
174+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
175+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
176+
.invoke('text')
177+
.should('eq', 'Ikke aktiv');
170178
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
171179

172180
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-table/task-wizard-table.component.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@
7070
'status-inactive': TaskWizardStatusesEnum[row.status] !== 'Active'
7171
}"
7272
>
73-
<span title="{{TaskWizardStatusesEnum[row.status] | translate}}">
74-
{{TaskWizardStatusesEnum[row.status] | translate}}
75-
</span>
73+
<span title="{{TaskWizardStatusesEnum[row.status] | translate}}">{{TaskWizardStatusesEnum[row.status] | translate}}</span>
7674
</mat-chip>
7775
</ng-template>
7876

0 commit comments

Comments
 (0)