Skip to content

Commit 7ca6aba

Browse files
renemadsenrenemadsen
committed
Fixing the tests to have a bit of delay before clicking on delete button.
1 parent dcb640a commit 7ca6aba

File tree

2 files changed

+80
-58
lines changed

2 files changed

+80
-58
lines changed

‎eform-client/e2e/Page objects/MyEforms.page.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class MyEformsPage extends PageWithNavbarPage {
5454

5555
createNewEform(eFormLabel, newTagsList = [], tagAddedNum = 0) {
5656
this.newEformBtn.click();
57-
browser.pause(3000);
57+
browser.pause(2000);
5858
// Create replaced xml and insert it in textarea
5959
const xml = XMLForEform.XML.replace('TEST_LABEL', eFormLabel);
6060
browser.execute(function (xmlText) {
@@ -71,11 +71,11 @@ class MyEformsPage extends PageWithNavbarPage {
7171
if (tagAddedNum > 0) {
7272
for (let i = 0; i < tagAddedNum; i++) {
7373
this.createEformTagSelector.click();
74-
browser.pause(3000);
74+
browser.pause(2000);
7575
const selectedTag = $('.ng-option:not(.ng-option-selected)');
7676
selectedTags.push(selectedTag.getText());
7777
selectedTag.click();
78-
browser.pause(3000);
78+
browser.pause(2000);
7979
}
8080
}
8181
this.createEformBtn.click();

‎eform-client/e2e/Tests/main-page-eforms/my-eforms.create-eform.spec.ts‎

Lines changed: 77 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ describe('My eforms', function () {
1515
expect(eform.eFormName).equal(newEformLabel);
1616
expect(eform.tags.length).equal(0);
1717
eform.deleteBtn.click();
18+
browser.pause(1000);
1819
$$('.btn-danger')[2].click();
1920
eform = myEformsPage.getFirstMyEformsRowObj();
2021
expect(eform.id === null);
@@ -28,64 +29,85 @@ describe('My eforms', function () {
2829
expect(eform.tags.length).equal(1);
2930
expect(eform.tags[0].getText()).equal(createdTag);
3031
eform.deleteBtn.click();
32+
browser.pause(1000);
3133
$$('.btn-danger')[2].click();
3234
eform = myEformsPage.getFirstMyEformsRowObj();
3335
expect(eform.id === null);
3436

3537
});
36-
// it('should create eform simultaneously with creating 2 tags', function () {
37-
// const newEformLabel = Guid.create().toString();
38-
// const createdTags = [Guid.create().toString(), Guid.create().toString()];
39-
// const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, createdTags);
40-
// const eform = myEformsPage.getFirstMyEformsRowObj();
41-
// const tagsTexts = eform.tags.map(el => {
42-
// return el.getText();
43-
// });
44-
// expect(eform.eFormName).equal(newEformLabel);
45-
// expect(eform.tags.length).equal(createdTags.length);
46-
// expect(tagsTexts).to.include.members(createdTags);
47-
// });
48-
// it('should create eform with creating 1 tag and using 1 already prepared tag', function () {
49-
// const newEformLabel = Guid.create().toString();
50-
// const createdTags = [Guid.create().toString()];
51-
// const tagAddedNum = 1;
52-
// const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, createdTags, tagAddedNum);
53-
// const eform = myEformsPage.getFirstMyEformsRowObj();
54-
// const tagsTexts = eform.tags.map(el => {
55-
// return el.getText();
56-
// });
57-
// expect(eform.eFormName).equal(newEformLabel);
58-
// expect(eform.tags.length).equal(createdTags.length + tagAddedNum);
59-
// expect(tagsTexts).to.include.members(createdTags);
60-
// expect(tagsTexts).to.include.members(addedAndSelectedTags.selected)
61-
// });
62-
// it('should create eform while adding 1 already prepared tag', function () {
63-
// const newEformLabel = Guid.create().toString();
64-
// const tagAddedNum = 1;
65-
// const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, undefined, tagAddedNum);
66-
// const eform = myEformsPage.getFirstMyEformsRowObj();
67-
// const tagsTexts = eform.tags.map(el => {
68-
// return el.getText();
69-
// });
70-
// expect(eform.eFormName).equal(newEformLabel);
71-
// expect(eform.tags.length).equal(tagAddedNum);
72-
// expect(tagsTexts).to.include.members(addedAndSelectedTags.selected);
73-
// });
74-
// it('should create eform while adding more than 2 already prepared tags', function () {
75-
// const newEformLabel = Guid.create().toString();
76-
// const tagAddedNum = 2;
77-
// const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, undefined, tagAddedNum);
78-
// const eform = myEformsPage.getFirstMyEformsRowObj();
79-
// const tagsTexts = eform.tags.map(el => {
80-
// return el.getText();
81-
// });
82-
// expect(eform.eFormName).equal(newEformLabel);
83-
// expect(eform.tags.length).equal(tagAddedNum);
84-
// expect(tagsTexts).to.include.members(addedAndSelectedTags.selected);
85-
// });
86-
// it('should not create eform if xml is empty', function () {
87-
// myEformsPage.newEformBtn.click();
88-
// browser.pause(5000);
89-
// expect(myEformsPage.createEformBtn.isEnabled()).equal(false);
90-
// });
38+
it('should create eform simultaneously with creating 2 tags', function () {
39+
const newEformLabel = Guid.create().toString();
40+
const createdTags = [Guid.create().toString(), Guid.create().toString()];
41+
const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, createdTags);
42+
let eform = myEformsPage.getFirstMyEformsRowObj();
43+
const tagsTexts = eform.tags.map(el => {
44+
return el.getText();
45+
});
46+
expect(eform.eFormName).equal(newEformLabel);
47+
expect(eform.tags.length).equal(createdTags.length);
48+
expect(tagsTexts).to.include.members(createdTags);
49+
eform.deleteBtn.click();
50+
browser.pause(1000);
51+
$$('.btn-danger')[2].click();
52+
eform = myEformsPage.getFirstMyEformsRowObj();
53+
expect(eform.id === null);
54+
});
55+
it('should create eform with creating 1 tag and using 1 already prepared tag', function () {
56+
const newEformLabel = Guid.create().toString();
57+
const createdTags = [Guid.create().toString()];
58+
const tagAddedNum = 1;
59+
const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, createdTags, tagAddedNum);
60+
let eform = myEformsPage.getFirstMyEformsRowObj();
61+
const tagsTexts = eform.tags.map(el => {
62+
return el.getText();
63+
});
64+
expect(eform.eFormName).equal(newEformLabel);
65+
expect(eform.tags.length).equal(createdTags.length + tagAddedNum);
66+
expect(tagsTexts).to.include.members(createdTags);
67+
expect(tagsTexts).to.include.members(addedAndSelectedTags.selected);
68+
eform.deleteBtn.click();
69+
browser.pause(1000);
70+
$$('.btn-danger')[2].click();
71+
eform = myEformsPage.getFirstMyEformsRowObj();
72+
expect(eform.id === null);
73+
});
74+
it('should create eform while adding 1 already prepared tag', function () {
75+
const newEformLabel = Guid.create().toString();
76+
const tagAddedNum = 1;
77+
const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, undefined, tagAddedNum);
78+
let eform = myEformsPage.getFirstMyEformsRowObj();
79+
const tagsTexts = eform.tags.map(el => {
80+
return el.getText();
81+
});
82+
expect(eform.eFormName).equal(newEformLabel);
83+
expect(eform.tags.length).equal(tagAddedNum);
84+
expect(tagsTexts).to.include.members(addedAndSelectedTags.selected);
85+
eform.deleteBtn.click();
86+
browser.pause(1000);
87+
$$('.btn-danger')[2].click();
88+
eform = myEformsPage.getFirstMyEformsRowObj();
89+
expect(eform.id === null);
90+
});
91+
it('should create eform while adding more than 2 already prepared tags', function () {
92+
const newEformLabel = Guid.create().toString();
93+
const tagAddedNum = 2;
94+
const addedAndSelectedTags = myEformsPage.createNewEform(newEformLabel, undefined, tagAddedNum);
95+
let eform = myEformsPage.getFirstMyEformsRowObj();
96+
const tagsTexts = eform.tags.map(el => {
97+
return el.getText();
98+
});
99+
expect(eform.eFormName).equal(newEformLabel);
100+
expect(eform.tags.length).equal(tagAddedNum);
101+
expect(tagsTexts).to.include.members(addedAndSelectedTags.selected);
102+
eform.deleteBtn.click();
103+
browser.pause(1000);
104+
$$('.btn-danger')[2].click();
105+
eform = myEformsPage.getFirstMyEformsRowObj();
106+
expect(eform.id === null);
107+
});
108+
it('should not create eform if xml is empty', function () {
109+
myEformsPage.newEformBtn.click();
110+
browser.pause(5000);
111+
expect(myEformsPage.createEformBtn.isEnabled()).equal(false);
112+
});
91113
});

0 commit comments

Comments
 (0)