Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 86d36af

Browse files
raghupola-vgraghupola-vg
authored
Merge pull request SORMAS-Foundation#3980 from hzi-braunschweig/3967-changes-to-modal-window-and-ORs
3967 changes to modal window and OR's
2 parents 0a9cb58 + da62f88 commit 86d36af

23 files changed

Lines changed: 117 additions & 125 deletions

File tree

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/div_Responsible contact officer_v-filtersel_edee33.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/div_Responsible contact officer_v-filterselect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>div_Responsible contact officer_v-filtersel_edee33</name>
4+
<name>div_Responsible contact officer_v-filterselect</name>
55
<tag></tag>
66
<elementGuidId>5a121d15-acb2-4dcd-a911-6e97712f97f3</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine end_gwt-uid-226.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine end.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Quarantine end_gwt-uid-226</name>
4+
<name>input_Quarantine end</name>
55
<tag></tag>
66
<elementGuidId>e54a5b2c-f832-4174-a5b8-a451b217811c</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine start_gwt-uid-228.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine start.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Quarantine start_gwt-uid-228</name>
4+
<name>input_Quarantine start</name>
55
<tag></tag>
66
<elementGuidId>89317d94-b8b4-4c7e-a80d-887d53c23455</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine_gwt-uid-205.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Quarantine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Quarantine_gwt-uid-205</name>
4+
<name>input_Quarantine</name>
55
<tag></tag>
66
<elementGuidId>daeadba6-a032-46d3-8f04-f54f3f956032</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Relationship with case_gwt-uid-195.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Relationship with case.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Relationship with case_gwt-uid-195</name>
4+
<name>input_Relationship with case</name>
55
<tag></tag>
66
<elementGuidId>44c70bde-bbef-4c31-b781-25943183f341</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible contact officer_gwt-uid-199.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible contact officer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Responsible contact officer_gwt-uid-199</name>
4+
<name>input_Responsible contact officer</name>
55
<tag></tag>
66
<elementGuidId>3a026a1e-5b60-41af-9f73-60a881d7ffa3</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible district_gwt-uid-203.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible district.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Responsible district_gwt-uid-203</name>
4+
<name>input_Responsible district</name>
55
<tag></tag>
66
<elementGuidId>6cc2afbc-435a-4803-8c30-5b1829395bf2</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible region_gwt-uid-207.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/input_Responsible region.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>input_Responsible region_gwt-uid-207</name>
4+
<name>input_Responsible region</name>
55
<tag></tag>
66
<elementGuidId>7eb3f0b1-a012-45b2-ba85-8738ac859911</elementGuidId>
77
<selectorCollection>

sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/span_Berlin CONTACT - Surveillance Officer _08c6e0.rs renamed to sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/span_Berlin CONTACT - Surveillance Officer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>span_Berlin CONTACT - Surveillance Officer _08c6e0</name>
4+
<name>span_Berlin CONTACT - Surveillance Officer</name>
55
<tag></tag>
66
<elementGuidId>0ad64a29-1bfc-4dc6-bbb5-31ec30a42377</elementGuidId>
77
<selectorCollection>

‎sormas-e2e-ui-tests/Object Repository/Contacts/ContactInformationView/ChangeContactData/span_Home.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
<tag></tag>
66
<elementGuidId>7e5b101b-a6d4-41c9-ab57-e2fc3c8ad2be</elementGuidId>
77
<selectorCollection>
8+
<entry>
9+
<key>BASIC</key>
10+
<value>//*[(text() = 'Home' or . = 'Home')]</value>
11+
</entry>
812
<entry>
913
<key>XPATH</key>
1014
<value>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[3]/td/span</value>
1115
</entry>
1216
</selectorCollection>
13-
<selectorMethod>XPATH</selectorMethod>
17+
<selectorMethod>BASIC</selectorMethod>
1418
<useRalativeImagePath>false</useRalativeImagePath>
1519
<webElementProperties>
1620
<isSelected>false</isSelected>

0 commit comments

Comments
 (0)