Skip to content

Commit e17a7a7

Browse files
CeliantCeliant
committed
first part of editing policies
1 parent bf6cb52 commit e17a7a7

File tree

4 files changed

+99
-91
lines changed

4 files changed

+99
-91
lines changed

‎e2e-tests/cypress/e2e/ui-tests/pages/policiesPage.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const PoliciesPageLocators = {
66
dynamicDialog: "p-dynamicdialog",
77
deleteButton: "p-button[label='Delete']",
88
actionsMore: "div.btn-icon-menu",
9+
editPolicy: "div.btn-icon-edit",
910
createPolicyButton: 'p-button[ng-reflect-content="Create a Policy"]',
1011
importPolicyButton: 'p-button[ng-reflect-content="Import"]',
1112
inputName: "[formcontrolname='name']",
@@ -219,6 +220,10 @@ export class PoliciesPage {
219220
cy.contains("td", name).siblings().eq(0).click();
220221
}
221222

223+
openEditingPolicy(name) {
224+
cy.contains(name).parent().parent().find(PoliciesPageLocators.editPolicy).click();
225+
}
226+
222227
approveUserInPolicy(waitFor = "revoke") {
223228
this.approve(waitFor);
224229
}

‎e2e-tests/cypress/e2e/ui-tests/specs/02_policies/edit/editPolicy.cy.js

Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,124 @@
1-
import {AuthenticationPage} from "../../../pages/authentication";
2-
import {PoliciesPage} from "../../../pages/policies";
1+
import { HomePage } from "../../../pages/homePage";
2+
const homePage = new HomePage();
33

4-
const home = new AuthenticationPage();
5-
const policies = new PoliciesPage();
4+
import { PoliciesPage } from "../../../pages/policiesPage";
5+
const policiesPage = new PoliciesPage();
66

7-
describe("Edit Policy", {tags: '@ui'}, () => {
7+
context("Edit Policy", { tags: ['ui'] }, () => {
88

99
const name = Math.floor(Math.random() * 999) + "testName";
1010

1111
beforeEach(() => {
1212
cy.viewport(1920, 1080);
13-
home.visit();
14-
home.login("StandardRegistry");
15-
policies.openPoliciesTab();
16-
policies.createPolicy();
17-
policies.fillNewPolicyForm(name);
18-
policies.openPoliciesTab();
13+
homePage.visit();
14+
homePage.login(SRUsername);
15+
policiesPage.openPoliciesTab();
1916
})
2017

2118
it("Verify if it possible to edit draft policy", () => {
22-
policies.checkStatus(name, "Draft");
23-
policies.clickEditPolicy(name);
24-
policies.fillFieldInEditPolicyPage("Name", name+"Edited");
25-
policies.fillFieldInEditPolicyPage("Description", "Description Edited");
26-
policies.clickSaveButton();
27-
policies.openPoliciesTab();
28-
policies.checkPolicyTableContains(name+"Edited");
29-
policies.checkPolicyTableContains("Description Edited");
19+
policiesPage.createPolicy();
20+
policiesPage.fillNewPolicyForm(name);
21+
policiesPage.backToPoliciesList();
22+
policiesPage.checkStatus(name, "Draft");
23+
policiesPage.openEditingPolicy(name);
24+
25+
26+
policiesPage.fillFieldInEditPolicyPage("Name", name+"Edited");
27+
policiesPage.fillFieldInEditPolicyPage("Description", "Description Edited");
28+
policiesPage.clickSaveButton();
29+
policiesPage.openPoliciesTab();
30+
policiesPage.checkPolicyTableContains(name+"Edited");
31+
policiesPage.checkPolicyTableContains("Description Edited");
3032
});
3133

3234
it("Verify if it impossible to edit In Dry Run policy", () => {
33-
policies.startDryRun(name);
34-
policies.checkStatus(name, " In Dry Run ");
35-
policies.clickEditPolicy(name);
36-
policies.checkFieldInEditPolicyIsNotEditable("Name");
37-
policies.checkFieldInEditPolicyIsNotEditable("Policy Tag");
38-
policies.checkFieldInEditPolicyIsNotEditable("Topic Description");
39-
policies.checkFieldInEditPolicyIsNotEditable("Description");
35+
policiesPage.startDryRun(name);
36+
policiesPage.checkStatus(name, " In Dry Run ");
37+
policiesPage.clickEditPolicy(name);
38+
policiesPage.checkFieldInEditPolicyIsNotEditable("Name");
39+
policiesPage.checkFieldInEditPolicyIsNotEditable("Policy Tag");
40+
policiesPage.checkFieldInEditPolicyIsNotEditable("Topic Description");
41+
policiesPage.checkFieldInEditPolicyIsNotEditable("Description");
4042
});
4143

4244
it("Verify if it impossible to edit Published policy", () => {
43-
policies.publishDraftPolicy(name);
44-
policies.openPoliciesTab();
45-
policies.checkStatus(name, " Published ");
46-
policies.clickEditPolicy(name);
47-
policies.checkFieldInEditPolicyIsNotEditable("Name");
48-
policies.checkFieldInEditPolicyIsNotEditable("Policy Tag");
49-
policies.checkFieldInEditPolicyIsNotEditable("Topic Description");
50-
policies.checkFieldInEditPolicyIsNotEditable("Description");
45+
policiesPage.publishDraftPolicy(name);
46+
policiesPage.openPoliciesTab();
47+
policiesPage.checkStatus(name, " Published ");
48+
policiesPage.clickEditPolicy(name);
49+
policiesPage.checkFieldInEditPolicyIsNotEditable("Name");
50+
policiesPage.checkFieldInEditPolicyIsNotEditable("Policy Tag");
51+
policiesPage.checkFieldInEditPolicyIsNotEditable("Topic Description");
52+
policiesPage.checkFieldInEditPolicyIsNotEditable("Description");
5153
});
5254

5355
it("Verify if fields are still empty after cancel editing", () => {
54-
policies.checkStatus(name, "Draft");
55-
policies.clickEditPolicy(name);
56-
policies.fillFieldInEditPolicyPage("Name", name+"Edited");
57-
policies.fillFieldInEditPolicyPage("Topic Description", "Topic Description Edited");
58-
policies.fillFieldInEditPolicyPage("Description", "Description Edited");
59-
policies.openPoliciesTab();
60-
policies.clickEditPolicy(name);
61-
policies.checkPolicyTableFieldIsEmpty("Description");
62-
policies.checkPolicyTableFieldIsEmpty("Topic Description");
56+
policiesPage.checkStatus(name, "Draft");
57+
policiesPage.clickEditPolicy(name);
58+
policiesPage.fillFieldInEditPolicyPage("Name", name+"Edited");
59+
policiesPage.fillFieldInEditPolicyPage("Topic Description", "Topic Description Edited");
60+
policiesPage.fillFieldInEditPolicyPage("Description", "Description Edited");
61+
policiesPage.openPoliciesTab();
62+
policiesPage.clickEditPolicy(name);
63+
policiesPage.checkPolicyTableFieldIsEmpty("Description");
64+
policiesPage.checkPolicyTableFieldIsEmpty("Topic Description");
6365
});
6466

6567
it("Verify if a modal window appears after returning to editing", () => {
66-
policies.openPoliciesTab();
67-
policies.checkStatus(name, "Draft");
68-
policies.clickEditPolicy(name);
69-
policies.fillFieldInEditPolicyPage("Tag", "Tag Edited");
70-
policies.fillFieldInEditPolicyPage("Title", "Title Edited");
71-
policies.openPoliciesTab();
72-
policies.clickEditPolicy(name);
73-
policies.checkModalWindowIsVisible("Apply latest changes");
74-
policies.checkModalWindowIsVisible("Do you want to apply latest changes?");
75-
policies.checkPolicyTableFieldIsEmpty("Description");
76-
policies.checkPolicyTableFieldIsEmpty("Topic Description");
68+
policiesPage.openPoliciesTab();
69+
policiesPage.checkStatus(name, "Draft");
70+
policiesPage.clickEditPolicy(name);
71+
policiesPage.fillFieldInEditPolicyPage("Tag", "Tag Edited");
72+
policiesPage.fillFieldInEditPolicyPage("Title", "Title Edited");
73+
policiesPage.openPoliciesTab();
74+
policiesPage.clickEditPolicy(name);
75+
policiesPage.checkModalWindowIsVisible("Apply latest changes");
76+
policiesPage.checkModalWindowIsVisible("Do you want to apply latest changes?");
77+
policiesPage.checkPolicyTableFieldIsEmpty("Description");
78+
policiesPage.checkPolicyTableFieldIsEmpty("Topic Description");
7779
});
7880

7981
it("Adding new blocks on edit policy page", () => {
80-
policies.checkStatus(name, "Draft");
81-
policies.clickEditPolicy(name);
82-
policies.waitForEditPage();
83-
policies.addNewBlockByName("Action");
84-
policies.addNewBlockByName("Filters Addon");
85-
policies.clickSaveButton();
86-
policies.openPoliciesTab();
87-
policies.clickEditPolicy(name);
88-
policies.checkBlockIsPresent("Block_1");
89-
policies.checkBlockIsPresent("Block_2");
82+
policiesPage.checkStatus(name, "Draft");
83+
policiesPage.clickEditPolicy(name);
84+
policiesPage.waitForEditPage();
85+
policiesPage.addNewBlockByName("Action");
86+
policiesPage.addNewBlockByName("Filters Addon");
87+
policiesPage.clickSaveButton();
88+
policiesPage.openPoliciesTab();
89+
policiesPage.clickEditPolicy(name);
90+
policiesPage.checkBlockIsPresent("Block_1");
91+
policiesPage.checkBlockIsPresent("Block_2");
9092
});
9193

9294
it("Modify Existing block and validate if changes are saved", () => {
93-
policies.checkStatus(name, "Draft");
94-
policies.clickEditPolicy(name);
95-
policies.waitForEditPage();
96-
policies.addNewBlockByName("Action");
97-
policies.addNewBlockByName("Aggregate Data");
98-
policies.clickOnAddedBlock("Block_1");
99-
policies.addNewBlockByName("Filters Addon");
100-
policies.addNewBlockByName("History");
101-
policies.clickSaveButton();
102-
policies.openPoliciesTab();
103-
policies.clickEditPolicy(name);
104-
policies.expandBlock("Block_1");
105-
policies.checkBlockIsPresent("Block_3");
106-
policies.checkBlockIsPresent("Block_4");
95+
policiesPage.checkStatus(name, "Draft");
96+
policiesPage.clickEditPolicy(name);
97+
policiesPage.waitForEditPage();
98+
policiesPage.addNewBlockByName("Action");
99+
policiesPage.addNewBlockByName("Aggregate Data");
100+
policiesPage.clickOnAddedBlock("Block_1");
101+
policiesPage.addNewBlockByName("Filters Addon");
102+
policiesPage.addNewBlockByName("History");
103+
policiesPage.clickSaveButton();
104+
policiesPage.openPoliciesTab();
105+
policiesPage.clickEditPolicy(name);
106+
policiesPage.expandBlock("Block_1");
107+
policiesPage.checkBlockIsPresent("Block_3");
108+
policiesPage.checkBlockIsPresent("Block_4");
107109
});
108110

109111
it("Delete existing block and validate if changes are saved", () => {
110-
policies.checkStatus(name, "Draft");
111-
policies.clickEditPolicy(name);
112-
policies.waitForEditPage();
113-
policies.addNewBlockByName("Action");
114-
policies.addNewBlockByName("Aggregate Data");
115-
policies.clickOnAddedBlock("Block_1");
116-
policies.clickOnDeleteBlockButton();
117-
policies.clickSaveButton();
118-
policies.openPoliciesTab();
119-
policies.clickEditPolicy(name);
120-
policies.checkBlockIsPresent("Block_2");
112+
policiesPage.checkStatus(name, "Draft");
113+
policiesPage.clickEditPolicy(name);
114+
policiesPage.waitForEditPage();
115+
policiesPage.addNewBlockByName("Action");
116+
policiesPage.addNewBlockByName("Aggregate Data");
117+
policiesPage.clickOnAddedBlock("Block_1");
118+
policiesPage.clickOnDeleteBlockButton();
119+
policiesPage.clickSaveButton();
120+
policiesPage.openPoliciesTab();
121+
policiesPage.clickEditPolicy(name);
122+
policiesPage.checkBlockIsPresent("Block_2");
121123
});
122124
});

‎e2e-tests/cypress/e2e/ui-tests/specs/02_policies/verraPolicy.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ context("Workflow Verra Policy", { tags: ['ui'] }, () => {
2929
//wait good params
3030
it("checks verra policy workflow", () => {
3131
// //Import and publish policy
32-
homePage.login(SRUsername);
32+
// homePage.login(SRUsername);
3333
// policiesPage.openPoliciesTab();
3434
// policiesPage.importPolicyFromIPFS("1739273276.903073085"); //iRec5
3535
// policiesPage.backToPoliciesList();

‎e2e-tests/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"scripts": {
77
"test": "npx cypress run",
88
"e2e": "cypress run",
9-
"ui-only": "cypress run --headed --env \"grepTags=ui,grepFilterSpecs=true\"",
9+
"ui-only-headed": "cypress run --headed --env \"grepTags=ui,grepFilterSpecs=true\"",
10+
"ui-only": "cypress run --env \"grepTags=ui,grepFilterSpecs=true\"",
1011
"test-tag": "./run-test-by-tag.sh",
1112
"api-tests": "npx cypress run --env \"grepTags=all, grepFilterSpecs=true\" --spec \"cypress/e2e/api-tests/**/*.cy.js\" --browser chrome",
1213
"smoke-pull": "npx cypress run --env \"grepTags=smoke, grepFilterSpecs=true\" --spec \"cypress/e2e/api-tests/**/*.cy.js\" --browser chrome"

0 commit comments

Comments
 (0)