Skip to content

Commit 73d568b

Browse files
shawonshawon
shawon
authored and
shawon
committed
fix all the failed test
1 parent edb402e commit 73d568b

File tree

6 files changed

+115
-59
lines changed

6 files changed

+115
-59
lines changed

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/BackendConfigurationProperties.page.ts‎

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class BackendConfigurationPropertiesPage extends PageWithNavbarPage {
194194
} else {
195195
cy.intercept('POST', '/api/backend-configuration-pn/properties/index').as('createProperty');
196196
this.propertyCreateSaveBtn().click();
197-
cy.wait('@createProperty', {timeout: 60000});
197+
cy.wait('@createProperty', { timeout: 60000 });
198198
}
199199
cy.wait(500);
200200
this.propertyCreateBtn().should('be.visible').should('be.enabled');
@@ -241,7 +241,6 @@ class BackendConfigurationPropertiesPage extends PageWithNavbarPage {
241241
}
242242
});
243243
}
244-
245244
goToPlanningPage() {
246245
cy.intercept('POST', '**/api/items-planning-pn/plannings/index').as('getPlannings');
247246
this.planningsButton().then(($ele) => {
@@ -253,7 +252,6 @@ class BackendConfigurationPropertiesPage extends PageWithNavbarPage {
253252
cy.wait('@getPlannings');
254253
this.planningCreateBtn().should('be.visible').should('be.enabled');
255254
}
256-
257255
public planningsButton() {
258256
return cy.get('#items-planning-pn-plannings');
259257
}
@@ -277,42 +275,8 @@ export class PropertyRowObject {
277275
deleteBtn: () => Cypress.Chainable<JQuery<HTMLElement>>;
278276

279277

280-
// getRow(rowNum: number) {
281-
// const row = () => cy.get('.mat-mdc-row').eq(rowNum - 1);
282-
// this.row = row();
283-
//
284-
// row()
285-
// .should('exist')
286-
// .then($r => {
287-
// if ($r.length === 0) {
288-
// cy.log(`No row found at index ${rowNum} — skipping action menu click.`);
289-
// return;
290-
// }
291-
//
292-
// const $actionCell = $r.find('[id^="action-items"]').filter(':visible').first();
293-
//
294-
// if ($actionCell.length > 0) {
295-
// cy.wrap($actionCell)
296-
// .find('#actionMenu', { timeout: 500 })
297-
// .filter(':visible')
298-
// .first()
299-
// .should('be.visible')
300-
// .click({ force: true });
301-
// } else {
302-
// cy.log(`Row ${rowNum} has no [id^="action-items"], skipping click.`);
303-
// return;
304-
// }
305-
// });
306-
//
307-
// this.viewAreasBtn = () => cy.get('[id^=showPropertyAreasBtn]').should('be.visible').should('be.enabled');
308-
// this.editPropertyBtn = () => cy.get('[id^=editPropertyBtn]').should('be.visible').should('be.enabled');
309-
// this.deleteBtn = () => cy.get('[id^=deletePropertyBtn]').should('be.visible').should('be.enabled');
310-
// return this;
311-
// }
312-
313-
314278
getRow(rowNum: number) {
315-
const row = () => cy.get('.mat-mdc-row').eq(rowNum - 1);
279+
const row = () => cy.get('.mat-mdc-row').should('exist').eq(rowNum - 1);
316280
this.row = row();
317281

318282
row()
@@ -327,25 +291,20 @@ export class PropertyRowObject {
327291

328292
if ($actionCell.length > 0) {
329293
cy.wrap($actionCell)
330-
.find('#actionMenu', {timeout: 1000})
294+
.find('#actionMenu', { timeout: 500 })
331295
.filter(':visible')
332296
.first()
333-
.should('exist')
334297
.should('be.visible')
335-
.click({force: true});
298+
.click({ force: true });
336299
} else {
337300
cy.log(`Row ${rowNum} has no [id^="action-items"], skipping click.`);
338301
return;
339302
}
340303
});
341304

342-
this.viewAreasBtn = () =>
343-
this.row.within(() => cy.get('[id^=showPropertyAreasBtn]').first().should('be.visible').should('be.enabled'));
344-
this.editPropertyBtn = () =>
345-
this.row.within(() => cy.get('[id^=editPropertyBtn]').first().should('be.visible').should('be.enabled'));
346-
this.deleteBtn = () =>
347-
this.row.within(() => cy.get('[id^=deletePropertyBtn]').first().should('be.visible').should('be.enabled'));
348-
305+
this.viewAreasBtn = () => cy.get('[id^=showPropertyAreasBtn]').should('be.visible').should('be.enabled');
306+
this.editPropertyBtn = () => cy.get('[id^=editPropertyBtn]').should('be.visible').should('be.enabled');
307+
this.deleteBtn = () => cy.get('[id^=deletePropertyBtn]').should('be.visible').should('be.enabled');
349308
return this;
350309
}
351310

@@ -371,10 +330,10 @@ export class PropertyRowObject {
371330

372331
if ($actionCell.length > 0) {
373332
cy.wrap($actionCell)
374-
.find('#actionMenu', {timeout: 500})
333+
.find('#actionMenu', { timeout: 500 })
375334
.filter(':visible')
376335
.should('be.visible')
377-
.click({force: true});
336+
.click({ force: true });
378337
} else {
379338
cy.log(`No action-items found in row for: ${propertyName}, skipping menu click.`);
380339
return;

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,20 @@ describe('Area rules type 1', () => {
138138
.invoke('text').should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
139139

140140
// Copy task
141-
cy.get('.cdk-row .cdk-column-actions .copyBtn').first().click();
141+
// cy.get('.cdk-row .cdk-column-actions .copyBtn').first().click();
142+
cy.get('.task-actions')
143+
.first()
144+
.find('#actionMenu')
145+
.should('be.visible')
146+
.click({ force: true });
147+
148+
// Now click the Copy Task button inside the opened menu
149+
cy.get('.cdk-overlay-container')
150+
.find('[id^=copyTaskBtn]')
151+
.should('be.visible')
152+
.first()
153+
.click({ force: true });
154+
142155
cy.intercept('POST', '**/api/backend-configuration-pn/task-wizard').as('createTask');
143156
cy.get('#createTaskBtn').click();
144157
cy.wait('@createTask', { timeout: 60000 });
@@ -178,7 +191,19 @@ describe('Area rules type 1', () => {
178191

179192
// Copy and set new eform
180193
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
181-
cy.get('.cdk-row .cdk-column-actions .copyBtn').first().click();
194+
// cy.get('.cdk-row .cdk-column-actions .copyBtn').first().click();
195+
cy.get('.task-actions')
196+
.first()
197+
.find('#actionMenu')
198+
.should('be.visible')
199+
.click({ force: true });
200+
201+
// Now click the Copy Task button inside the opened menu
202+
cy.get('.cdk-overlay-container')
203+
.find('[id^=copyTaskBtn]')
204+
.should('be.visible')
205+
.first()
206+
.click({ force: true });
182207
cy.intercept('POST', '**/api/backend-configuration-pn/task-wizard').as('createTask');
183208
selectValueInNgSelector('#createTemplateSelector', editedTask.eformName, true);
184209
cy.get('#createTaskBtn').click();

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,19 @@ describe('Area rules type 1', () => {
154154
cy.get('#backend-configuration-pn-task-wizard').click();
155155
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
156156
cy.intercept('POST', '**/api/templates/index').as('getTemplates');
157-
cy.get('.editBtn').click();
157+
// cy.get('.editBtn').click();
158+
cy.get('[id^=action-items]')
159+
.first()
160+
.find('#actionMenu')
161+
.should('be.visible')
162+
.click({ force: true });
163+
164+
// Now click the Copy Task button inside the opened menu
165+
cy.get('.cdk-overlay-container')
166+
.find('[id^=editTaskBtn]')
167+
.should('be.visible')
168+
.first()
169+
.click({ force: true });
158170
cy.wait('@getFolders', { timeout: 60000 });
159171
cy.wait('@getTemplates', { timeout: 60000 });
160172
//cy.get('.editBtn > .mat-mdc-button-touch-target').click();
@@ -174,7 +186,19 @@ describe('Area rules type 1', () => {
174186
cy.get('#backend-configuration-pn-task-wizard').click();
175187
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
176188
cy.intercept('POST', '**/api/templates/index').as('getTemplates');
177-
cy.get('.editBtn').click();
189+
// cy.get('.editBtn').click();
190+
cy.get('[id^=action-items]')
191+
.first()
192+
.find('#actionMenu')
193+
.should('be.visible')
194+
.click({ force: true });
195+
196+
// Now click the Copy Task button inside the opened menu
197+
cy.get('.cdk-overlay-container')
198+
.find('[id^=editTaskBtn]')
199+
.should('be.visible')
200+
.first()
201+
.click({ force: true });
178202
cy.wait('@getFolders', { timeout: 60000 });
179203
cy.wait('@getTemplates', { timeout: 60000 });
180204
//cy.get('.editBtn > .mat-mdc-button-touch-target').click();

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,19 @@ describe('Area rules type 1', () => {
158158
cy.wait('@createFolder', { timeout: 60000 });
159159
cy.wait(1000);
160160
cy.get('#backend-configuration-pn-task-wizard').scrollIntoView().click();
161-
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
161+
// cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
162+
cy.get('[id^=action-items]')
163+
.first()
164+
.find('#actionMenu')
165+
.should('be.visible')
166+
.click({ force: true });
167+
168+
// Now click the Copy Task button inside the opened menu
169+
cy.get('.cdk-overlay-container')
170+
.find('[id^=editTaskBtn]')
171+
.should('be.visible')
172+
.first()
173+
.click({ force: true });
162174
// // change task
163175
cy.get('#updateTaskStatusToggle').click();
164176
cy.get('#updateTaskBtn').click();
@@ -181,7 +193,19 @@ describe('Area rules type 1', () => {
181193
.invoke('text')
182194
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
183195

184-
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
196+
// cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
197+
cy.get('[id^=action-items]')
198+
.first()
199+
.find('#actionMenu')
200+
.should('be.visible')
201+
.click({ force: true });
202+
203+
// Now click the Copy Task button inside the opened menu
204+
cy.get('.cdk-overlay-container')
205+
.find('[id^=editTaskBtn]')
206+
.should('be.visible')
207+
.first()
208+
.click({ force: true });
185209
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
186210
// cy.get('#updateProperty').click();
187211
// //selectValueInNgSelectorNoSelector(`${property2.cvrNumber} - ${property2.chrNumber} - ${property2.name}`);

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,19 @@ describe('Area rules type 1', () => {
156156
cy.get('#folderSaveBtn').click();
157157
cy.wait(1000);
158158
cy.get('#backend-configuration-pn-task-wizard').scrollIntoView().click();
159-
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
159+
// cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
160+
cy.get('.task-actions')
161+
.first()
162+
.find('#actionMenu')
163+
.should('be.visible')
164+
.click({ force: true });
165+
166+
// Now click the Edit Task button inside the opened menu
167+
cy.get('.cdk-overlay-container')
168+
.find('[id^=editTaskBtn]')
169+
.should('be.visible')
170+
.first()
171+
.click({ force: true });
160172
// // change task
161173
cy.get('#updateTaskStatusToggle').click();
162174
cy.get('#updateTaskBtn').click();
@@ -179,7 +191,19 @@ describe('Area rules type 1', () => {
179191
.invoke('text')
180192
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
181193

182-
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
194+
// cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
195+
cy.get('.task-actions')
196+
.first()
197+
.find('#actionMenu')
198+
.should('be.visible')
199+
.click({ force: true });
200+
201+
// Now click the Edit Task button inside the opened menu
202+
cy.get('.cdk-overlay-container')
203+
.find('[id^=editTaskBtn]')
204+
.should('be.visible')
205+
.first()
206+
.click({ force: true });
183207
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
184208
// cy.get('#updateProperty').click();
185209
// //selectValueInNgSelectorNoSelector(`${property2.cvrNumber} - ${property2.chrNumber} - ${property2.name}`);

‎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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686

8787
<ng-template #actionsTpl let-row let-i="index">
8888
<div class="task-actions" id="action-items-{{i}}">
89-
<button mat-icon-button [matMenuTriggerFor]="menu">
89+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu">
9090
<mat-icon>more_vert</mat-icon>
9191
</button>
9292
<mat-menu #menu="matMenu">

0 commit comments

Comments
 (0)