Skip to content

Commit 8ba7681

Browse files
Gid733Gid733
authored
Merge pull request #131 from Gid733/master
Small fixes and improvements
2 parents eb61ac7 + 98a2706 commit 8ba7681

File tree

28 files changed

+616
-61
lines changed

28 files changed

+616
-61
lines changed

‎eform-client/e2e/Constants/MyEformsConstants.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
export default {};
1+
export default {
2+
};

‎eform-client/e2e/Constants/XMLForEform.ts‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
export default {
2+
XML: "<Main>\n" +
3+
" <Id>12</Id>\n" +
4+
" <Repeated>0</Repeated>\n" +
5+
" <Label>TEST_LABEL</Label>\n" +
6+
" <Description></Description>\n" +
7+
" <StartDate>2012-08-09</StartDate>\n" +
8+
" <EndDate>2022-08-09</EndDate>\n" +
9+
" <Language>da</Language>\n" +
10+
" <MultiApproval>false</MultiApproval>\n" +
11+
" <FastNavigation>false</FastNavigation>\n" +
12+
" <Review>false</Review>\n" +
13+
" <Summary>false</Summary>\n" +
14+
" <DisplayOrder>3164</DisplayOrder>\n" +
15+
" <CheckListFolderName>Storebælt - Skinneudtræk 2 mdr.</CheckListFolderName>\n" +
16+
" <ElementList>\n" +
17+
" <Element type=\"DataElement\">\n" +
18+
" <Id>13</Id>\n" +
19+
" <Label>Målinger</Label>\n" +
20+
" <DisplayOrder>1</DisplayOrder>\n" +
21+
" <ReviewEnabled>true</ReviewEnabled>\n" +
22+
" <ManualSync>false</ManualSync>\n" +
23+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
24+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
25+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
26+
" <DataItemList>\n" +
27+
" <DataItem type=\"number\">\n" +
28+
" <Id>59</Id>\n" +
29+
" <Label>Skinnetemperatur</Label>\n" +
30+
" <Description>C</Description>\n" +
31+
" <MinValue>-15000</MinValue>\n" +
32+
" <MaxValue>15000</MaxValue>\n" +
33+
" <Value></Value>\n" +
34+
" <DecimalCount>2</DecimalCount>\n" +
35+
" <UnitName></UnitName>\n" +
36+
" <Mandatory>false</Mandatory>\n" +
37+
" </DataItem>\n" +
38+
" </DataItemList>\n" +
39+
" </Element>\n" +
40+
" <Element type=\"GroupElement\">\n" +
41+
" <Id>14</Id>\n" +
42+
" <Label>Tungetilslutning</Label>\n" +
43+
" <DisplayOrder>2</DisplayOrder>\n" +
44+
" <ElementList>\n" +
45+
" <Element type=\"DataElement\">\n" +
46+
" <Id>15</Id>\n" +
47+
" <Label>1. svelle imod Sprogø</Label>\n" +
48+
" <DisplayOrder>0</DisplayOrder>\n" +
49+
" <ReviewEnabled>false</ReviewEnabled>\n" +
50+
" <ManualSync>false</ManualSync>\n" +
51+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
52+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
53+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
54+
" <DataItemList>\n" +
55+
" <DataItem type=\"number\">\n" +
56+
" <Id>65</Id>\n" +
57+
" <Label>Venstre streng 1</Label>\n" +
58+
" <Description>mm</Description>\n" +
59+
" <MinValue>-15000</MinValue>\n" +
60+
" <MaxValue>15000</MaxValue>\n" +
61+
" <Value></Value>\n" +
62+
" <DecimalCount>2</DecimalCount>\n" +
63+
" <UnitName></UnitName>\n" +
64+
" <Mandatory>false</Mandatory>\n" +
65+
" </DataItem>\n" +
66+
" </DataItemList>\n" +
67+
" </Element>\n" +
68+
" <Element type=\"DataElement\">\n" +
69+
" <Id>16</Id>\n" +
70+
" <Label>2. svelle imod Sprogø</Label>\n" +
71+
" <DisplayOrder>1</DisplayOrder>\n" +
72+
" <ReviewEnabled>false</ReviewEnabled>\n" +
73+
" <ManualSync>false</ManualSync>\n" +
74+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
75+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
76+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
77+
" <DataItemList>\n" +
78+
" <DataItem type=\"number\">\n" +
79+
" <Id>72</Id>\n" +
80+
" <Label>Venstre streng 1</Label>\n" +
81+
" <Description>mm</Description>\n" +
82+
" <MinValue>-15000</MinValue>\n" +
83+
" <MaxValue>15000</MaxValue>\n" +
84+
" <Value></Value>\n" +
85+
" <DecimalCount>2</DecimalCount>\n" +
86+
" <UnitName></UnitName>\n" +
87+
" <Mandatory>false</Mandatory>\n" +
88+
" </DataItem>\n" +
89+
" </DataItemList>\n" +
90+
" </Element>\n" +
91+
" <Element type=\"DataElement\">\n" +
92+
" <Id>17</Id>\n" +
93+
" <Label>1. svelle imod Nyborg</Label>\n" +
94+
" <DisplayOrder>2</DisplayOrder>\n" +
95+
" <ReviewEnabled>false</ReviewEnabled>\n" +
96+
" <ManualSync>false</ManualSync>\n" +
97+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
98+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
99+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
100+
" <DataItemList>\n" +
101+
" <DataItem type=\"number\">\n" +
102+
" <Id>79</Id>\n" +
103+
" <Label>Venstre streng 1</Label>\n" +
104+
" <Description>mm</Description>\n" +
105+
" <MinValue>-15000</MinValue>\n" +
106+
" <MaxValue>15000</MaxValue>\n" +
107+
" <Value></Value>\n" +
108+
" <DecimalCount>2</DecimalCount>\n" +
109+
" <UnitName></UnitName>\n" +
110+
" <Mandatory>false</Mandatory>\n" +
111+
" </DataItem>\n" +
112+
" </DataItemList>\n" +
113+
" </Element>\n" +
114+
" <Element type=\"DataElement\">\n" +
115+
" <Id>18</Id>\n" +
116+
" <Label>2. svelle imod Nyborg</Label>\n" +
117+
" <DisplayOrder>3</DisplayOrder>\n" +
118+
" <ReviewEnabled>false</ReviewEnabled>\n" +
119+
" <ManualSync>false</ManualSync>\n" +
120+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
121+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
122+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
123+
" <DataItemList>\n" +
124+
" <DataItem type=\"number\">\n" +
125+
" <Id>86</Id>\n" +
126+
" <Label>Venstre streng 1</Label>\n" +
127+
" <Description>mm</Description>\n" +
128+
" <MinValue>-15000</MinValue>\n" +
129+
" <MaxValue>15000</MaxValue>\n" +
130+
" <Value></Value>\n" +
131+
" <DecimalCount>2</DecimalCount>\n" +
132+
" <UnitName></UnitName>\n" +
133+
" <Mandatory>false</Mandatory>\n" +
134+
" </DataItem>\n" +
135+
" </DataItemList>\n" +
136+
" </Element>\n" +
137+
" </ElementList>\n" +
138+
" </Element>\n" +
139+
" <Element type=\"DataElement\">\n" +
140+
" <Id>19</Id>\n" +
141+
" <Label>Skinneudtrækkets stilling</Label>\n" +
142+
" <DisplayOrder>3</DisplayOrder>\n" +
143+
" <ReviewEnabled>false</ReviewEnabled>\n" +
144+
" <ManualSync>false</ManualSync>\n" +
145+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
146+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
147+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
148+
" <DataItemList>\n" +
149+
" <DataItem type=\"number\">\n" +
150+
" <Id>93</Id>\n" +
151+
" <Label>Sprogø-enden (venstre streng)</Label>\n" +
152+
" <Description>mm</Description>\n" +
153+
" <MinValue>-15000</MinValue>\n" +
154+
" <MaxValue>15000</MaxValue>\n" +
155+
" <Value></Value>\n" +
156+
" <DecimalCount>2</DecimalCount>\n" +
157+
" <UnitName></UnitName>\n" +
158+
" <Mandatory>false</Mandatory>\n" +
159+
" </DataItem>\n" +
160+
" </DataItemList>\n" +
161+
" </Element>\n" +
162+
" <Element type=\"DataElement\">\n" +
163+
" <Id>20</Id>\n" +
164+
" <Label>Sporvidde</Label>\n" +
165+
" <DisplayOrder>4</DisplayOrder>\n" +
166+
" <ReviewEnabled>false</ReviewEnabled>\n" +
167+
" <ManualSync>false</ManualSync>\n" +
168+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
169+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
170+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
171+
" <DataItemList>\n" +
172+
" <DataItem type=\"number\">\n" +
173+
" <Id>102</Id>\n" +
174+
" <Label>Sporvidde 1</Label>\n" +
175+
" <Description>(1430 - 1450 mm)</Description>\n" +
176+
" <MinValue>1000</MinValue>\n" +
177+
" <MaxValue>1500</MaxValue>\n" +
178+
" <Value></Value>\n" +
179+
" <DecimalCount>2</DecimalCount>\n" +
180+
" <UnitName></UnitName>\n" +
181+
" <Mandatory>false</Mandatory>\n" +
182+
" </DataItem>\n" +
183+
" </DataItemList>\n" +
184+
" </Element>\n" +
185+
" <Element type=\"DataElement\">\n" +
186+
" <Id>21</Id>\n" +
187+
" <Label>Smørring</Label>\n" +
188+
" <DisplayOrder>5</DisplayOrder>\n" +
189+
" <ReviewEnabled>false</ReviewEnabled>\n" +
190+
" <ManualSync>false</ManualSync>\n" +
191+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
192+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
193+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
194+
" <DataItemList>\n" +
195+
" <DataItem type=\"single_select\">\n" +
196+
" <Id>110</Id>\n" +
197+
" <Label>Kontaktflade sideskinne/tunge</Label>\n" +
198+
" <Description>Smøring udført</Description>\n" +
199+
" <KeyValuePairList>\n" +
200+
" <KeyValuePair>\n" +
201+
" <Key>1</Key>\n" +
202+
" <Value>Ja</Value>\n" +
203+
" <Selected>false</Selected>\n" +
204+
" <DisplayOrder>0</DisplayOrder>\n" +
205+
" </KeyValuePair>\n" +
206+
" <KeyValuePair>\n" +
207+
" <Key>2</Key>\n" +
208+
" <Value>Nej</Value>\n" +
209+
" <Selected>false</Selected>\n" +
210+
" <DisplayOrder>1</DisplayOrder>\n" +
211+
" </KeyValuePair>\n" +
212+
" </KeyValuePairList>\n" +
213+
" <Mandatory>false</Mandatory>\n" +
214+
" </DataItem>\n" +
215+
" </DataItemList>\n" +
216+
" </Element>\n" +
217+
" <Element type=\"DataElement\">\n" +
218+
" <Id>22</Id>\n" +
219+
" <Label>Kontrol af tilspændinger</Label>\n" +
220+
" <DisplayOrder>6</DisplayOrder>\n" +
221+
" <ReviewEnabled>false</ReviewEnabled>\n" +
222+
" <ManualSync>false</ManualSync>\n" +
223+
" <ExtraFieldsEnabled>true</ExtraFieldsEnabled>\n" +
224+
" <DoneButtonDisabled>false</DoneButtonDisabled>\n" +
225+
" <ApprovalEnabled>true</ApprovalEnabled>\n" +
226+
" <DataItemList>\n" +
227+
" <DataItem type=\"single_select\">\n" +
228+
" <Id>115</Id>\n" +
229+
" <Label>Befæstelse ved tunger</Label>\n" +
230+
" <Description>Moment 250Nm</Description>\n" +
231+
" <KeyValuePairList>\n" +
232+
" <KeyValuePair>\n" +
233+
" <Key>1</Key>\n" +
234+
" <Value>OK</Value>\n" +
235+
" <Selected>false</Selected>\n" +
236+
" <DisplayOrder>0</DisplayOrder>\n" +
237+
" </KeyValuePair>\n" +
238+
" <KeyValuePair>\n" +
239+
" <Key>2</Key>\n" +
240+
" <Value>ikke OK</Value>\n" +
241+
" <Selected>false</Selected>\n" +
242+
" <DisplayOrder>1</DisplayOrder>\n" +
243+
" </KeyValuePair>\n" +
244+
" </KeyValuePairList>\n" +
245+
" <Mandatory>false</Mandatory>\n" +
246+
" </DataItem>\n" +
247+
" </DataItemList>\n" +
248+
" </Element>\n" +
249+
" </ElementList>\n" +
250+
"</Main>"
251+
}

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

Lines changed: 93 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,114 @@
11
import {PageWithNavbarPage} from './PageWithNavbar.page';
2+
import XMLForEform from "../Constants/XMLForEform";
23

34
class MyEformsPage extends PageWithNavbarPage {
45
constructor() {
56
super();
67
}
78

8-
public getRowNum(): number {
9+
public get newEformBtn() {
10+
return browser.element('#newEFormBtn');
11+
}
912

13+
public getRowNum(): number {
1014
return 10;
1115
}
16+
17+
public get idSortBtn() {
18+
return browser.element('#idSort');
19+
}
20+
21+
public get createdAtSortBtn() {
22+
return browser.element('#createdAtSort');
23+
}
24+
25+
public get eformNameSortBtn() {
26+
return browser.element('#nameEFormSort')
27+
}
28+
29+
30+
// Create eform modal
31+
public get createEformTagSelector() {
32+
return browser.element('#createEFormMultiSelector');
33+
}
34+
35+
public get createEformNewTagInput() {
36+
return browser.element('#addTagInput');
37+
}
38+
39+
public get xmlTextArea() {
40+
return browser.element('#eFormXml');
41+
}
42+
43+
public get createEformBtn() {
44+
return browser.element('#createEformBtn');
45+
}
46+
47+
public get cancelCreateEformBtn() {
48+
return browser.element('#cancelCreateEformBtn');
49+
}
50+
51+
getFirstMyEformsRowObj(): MyEformsRowObject {
52+
return new MyEformsRowObject(1);
53+
}
54+
55+
createNewEform(eFormLabel, newTagsList = [], tagAddedNum = 0) {
56+
this.newEformBtn.click();
57+
browser.pause(3000);
58+
// Create replaced xml and insert it in textarea
59+
let xml = XMLForEform.XML.replace('TEST_LABEL', eFormLabel);
60+
browser.execute(function (xmlText) {
61+
(<HTMLInputElement>document.getElementById("eFormXml")).value = xmlText;
62+
}, xml);
63+
this.xmlTextArea.addValue(' ');
64+
// Create new tags
65+
let addedTags: string[] = newTagsList;
66+
if (newTagsList.length > 0) {
67+
this.createEformNewTagInput.setValue(newTagsList.join(','));
68+
}
69+
// Add existing tags
70+
let selectedTags: string[] = [];
71+
if (tagAddedNum > 0) {
72+
for (let i = 0; i < tagAddedNum; i++) {
73+
this.createEformTagSelector.click();
74+
browser.pause(2000);
75+
let selectedTag = $('.ng-option:not(.ng-option-selected)');
76+
selectedTags.push(selectedTag.getText());
77+
selectedTag.click();
78+
browser.pause(2000);
79+
}
80+
}
81+
this.createEformBtn.click();
82+
browser.pause(10000);
83+
return {added: addedTags, selected: selectedTags}
84+
}
1285
}
1386

1487
const myEformsPage = new MyEformsPage();
1588
export default myEformsPage;
1689

1790
class MyEformsRowObject {
18-
constructor() {
19-
91+
constructor(rowNum) {
92+
this.id = +$$('#eform-id')[rowNum - 1];
93+
this.createdAt = new Date($$('#eform-created-at')[rowNum - 1].getText());
94+
this.eFormName = $$('#eform-label')[rowNum - 1].getText();
95+
this.tags = $$(`//*[@id="mainPageEFormsTableBody"]/tr[${rowNum}]//*[@id="eform-tag"]`);
96+
this.pairs = $$(`//*[@id="mainPageEFormsTableBody"]/tr[${rowNum}]//*[@id="eform-tag"]`);
97+
this.editTagsBtn = $$('#eform-edit-btn')[rowNum - 1];
98+
this.pairEformBtn = $$('#eform-pairing-btn')[rowNum - 1];
99+
this.editColumnsBtn = $$('#edit-columnts-btn')[rowNum - 1];
100+
this.deleteBtn = $$('#delete-eform-btn')[rowNum - 1];
101+
this.uploadZipArchiveBtn = $$('#upload-zip-btn')[rowNum - 1]
20102
}
21103

22104
id: number;
23105
createdAt: Date;
24-
firstName;
25-
lastName;
26-
tags: string[];
27-
pairingBtn;
106+
eFormName;
107+
tags;
108+
editTagsBtn;
109+
pairs;
110+
pairEformBtn;
111+
editColumnsBtn;
112+
deleteBtn;
113+
uploadZipArchiveBtn;
28114
}

‎eform-client/e2e/Tests/device-users/device-users.delete.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('Device users page', function () {
1717
lastDeviceUser.deleteBtn.leftClick();
1818
browser.pause(6000);
1919
deviceUsersPage.saveDeleteBtn.leftClick();
20-
browser.pause(24000);
20+
browser.pause(6000);
2121
const rowNumAfterDelete = deviceUsersPage.rowNum;
2222
expect(rowNumBeforeDelete, 'User deleted incorrectly').equal(rowNumAfterDelete + 1);
2323
});
@@ -26,9 +26,9 @@ describe('Device users page', function () {
2626
const lastDeviceUser = deviceUsersPage.getDeviceUser(rowNumBeforeDelete);
2727
lastDeviceUser.deleteBtn.waitForVisible(5000);
2828
lastDeviceUser.deleteBtn.leftClick();
29-
browser.pause(16000);
29+
browser.pause(8000);
3030
deviceUsersPage.cancelDeleteBtn.leftClick();
31-
browser.pause(12000);
31+
browser.pause(8000);
3232
const rowNumAfterCancelDelete = deviceUsersPage.rowNum;
3333
expect(rowNumBeforeDelete).equal(rowNumAfterCancelDelete);
3434
});

0 commit comments

Comments
 (0)