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

Commit da62f88

Browse files
raghupola-vgraghupola-vg
committed
SORMAS-Foundation#3967 - changes to epi data validation tab and drop down selection on long forms
1 parent 3fa962e commit da62f88

6 files changed

Lines changed: 39 additions & 66 deletions

File tree

sormas-e2e-ui-tests/Object Repository/Surveillance/CaseView/Epidemiological data/i_EpidemiologicalData_description_text.rs renamed to sormas-e2e-ui-tests/Object Repository/Surveillance/CaseView/Epidemiological data/span_Exposure Investigation.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<WebElementEntity>
33
<description></description>
4-
<name>i_EpidemiologicalData_description_text</name>
4+
<name>span_Exposure Investigation</name>
55
<tag></tag>
6-
<elementGuidId>9544018b-e6ad-4f7a-ab80-004948435526</elementGuidId>
6+
<elementGuidId>c3c79412-cbb2-49d7-9fd0-531b011d9065</elementGuidId>
77
<selectorMethod>BASIC</selectorMethod>
88
<useRalativeImagePath>false</useRalativeImagePath>
99
<webElementProperties>
1010
<isSelected>false</isSelected>
1111
<matchCondition>equals</matchCondition>
1212
<name>tag</name>
1313
<type>Main</type>
14-
<value>i</value>
14+
<value>span</value>
1515
</webElementProperties>
1616
<webElementProperties>
1717
<isSelected>true</isSelected>
1818
<matchCondition>equals</matchCondition>
1919
<name>text</name>
2020
<type>Main</type>
21-
<value>Please indicate if any of the following is relevant for the patient during the incubation period.</value>
21+
<value>Exposure Investigation</value>
2222
</webElementProperties>
2323
<webElementProperties>
2424
<isSelected>false</isSelected>
2525
<matchCondition>equals</matchCondition>
2626
<name>xpath</name>
2727
<type>Main</type>
28-
<value>id(&quot;sormasui-1655777373&quot;)/div[@class=&quot;v-ui valo-menu-responsive v-scrollable&quot;]/div[@class=&quot;v-horizontallayout v-layout v-horizontal v-widget v-has-width v-has-height&quot;]/div[@class=&quot;v-expand&quot;]/div[@class=&quot;v-slot v-slot-sormas-content&quot;]/div[@class=&quot;v-csslayout v-layout v-widget sormas-content v-csslayout-sormas-content v-has-width v-has-height&quot;]/div[@class=&quot;v-verticallayout v-layout v-vertical v-widget v-has-width v-has-height&quot;]/div[@class=&quot;v-expand&quot;]/div[@class=&quot;v-slot&quot;]/div[@class=&quot;v-verticallayout v-layout v-vertical v-widget v-margin-top v-margin-right v-margin-bottom v-margin-left&quot;]/div[@class=&quot;v-slot&quot;]/div[@class=&quot;v-panel v-widget&quot;]/div[@class=&quot;v-panel-content v-scrollable&quot;]/div[@class=&quot;v-customcomponent v-widget v-has-width&quot;]/div[@class=&quot;v-customlayout v-layout v-widget v-has-width&quot;]/div[1]/div[@class=&quot;v-label v-widget v-label-undef-w&quot;]/div[@class=&quot;vspace-3&quot;]/div[1]/i[1]</value>
28+
<value>id(&quot;sormasui-1655777373&quot;)/div[@class=&quot;v-ui valo-menu-responsive v-scrollable&quot;]/div[@class=&quot;v-horizontallayout v-layout v-horizontal v-widget print-container v-horizontallayout-print-container v-has-width v-has-height&quot;]/div[@class=&quot;v-expand&quot;]/div[@class=&quot;v-slot v-slot-sormas-content v-slot-print-view-container&quot;]/div[@class=&quot;v-csslayout v-layout v-widget sormas-content v-csslayout-sormas-content print-view-container v-csslayout-print-view-container v-has-width v-has-height&quot;]/div[@class=&quot;v-verticallayout v-layout v-vertical v-widget v-has-width&quot;]/div[@class=&quot;v-slot&quot;]/div[@class=&quot;v-verticallayout v-layout v-vertical v-widget v-has-width v-margin-top v-margin-right v-margin-bottom v-margin-left&quot;]/div[@class=&quot;v-slot v-slot-root-component&quot;]/div[@class=&quot;v-customlayout v-layout v-widget root-component v-customlayout-root-component v-has-width&quot;]/div[@class=&quot;row&quot;]/div[@class=&quot;col-lg-8 col-xs-12&quot;]/div[@class=&quot;v-verticallayout v-layout v-vertical v-widget main-component v-verticallayout-main-component v-has-width&quot;]/div[@class=&quot;v-slot&quot;]/div[@class=&quot;v-panel v-widget v-has-width&quot;]/div[@class=&quot;v-panel-content v-scrollable&quot;]/div[@class=&quot;v-customcomponent v-widget v-has-width&quot;]/div[@class=&quot;v-customlayout v-layout v-widget v-has-width&quot;]/div[1]/div[@class=&quot;v-label v-widget v-label-undef-w&quot;]/h3[1]/span[1]</value>
2929
</webElementProperties>
3030
<webElementXpaths>
3131
<isSelected>true</isSelected>
3232
<matchCondition>equals</matchCondition>
3333
<name>xpath:idRelative</name>
3434
<type>Main</type>
35-
<value>//div[@id='sormasui-1655777373']/div/div[2]/div/div[2]/div/div/div/div[3]/div/div/div/div[2]/div/div/div/div/div/div/i</value>
35+
<value>//div[@id='sormasui-1655777373']/div/div[2]/div/div[2]/div/div/div[3]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/h3/span</value>
3636
</webElementXpaths>
3737
<webElementXpaths>
3838
<isSelected>false</isSelected>
3939
<matchCondition>equals</matchCondition>
4040
<name>xpath:neighbor</name>
4141
<type>Main</type>
42-
<value>(.//*[normalize-space(text()) and normalize-space(.)='Epidemiological data'])[2]/following::i[1]</value>
42+
<value>(.//*[normalize-space(text()) and normalize-space(.)='Contacts'])[2]/following::span[2]</value>
4343
</webElementXpaths>
4444
<webElementXpaths>
4545
<isSelected>false</isSelected>
4646
<matchCondition>equals</matchCondition>
4747
<name>xpath:neighbor</name>
4848
<type>Main</type>
49-
<value>(.//*[normalize-space(text()) and normalize-space(.)='Contacts'])[2]/following::i[1]</value>
49+
<value>(.//*[normalize-space(text()) and normalize-space(.)='Follow-up'])[1]/following::span[3]</value>
5050
</webElementXpaths>
5151
<webElementXpaths>
5252
<isSelected>false</isSelected>
5353
<matchCondition>equals</matchCondition>
5454
<name>xpath:neighbor</name>
5555
<type>Main</type>
56-
<value>(.//*[normalize-space(text()) and normalize-space(.)='Close contact (within 1 meter) with a probable or confirmed case'])[1]/preceding::i[1]</value>
56+
<value>(.//*[normalize-space(text()) and normalize-space(.)='Exposure details known'])[1]/preceding::span[1]</value>
5757
</webElementXpaths>
5858
<webElementXpaths>
5959
<isSelected>false</isSelected>
6060
<matchCondition>equals</matchCondition>
6161
<name>xpath:neighbor</name>
6262
<type>Main</type>
63-
<value>(.//*[normalize-space(text()) and normalize-space(.)='Yes'])[1]/preceding::i[1]</value>
63+
<value>(.//*[normalize-space(text()) and normalize-space(.)='Yes'])[1]/preceding::span[1]</value>
6464
</webElementXpaths>
6565
<webElementXpaths>
6666
<isSelected>false</isSelected>
6767
<matchCondition>equals</matchCondition>
6868
<name>xpath:neighbor</name>
6969
<type>Main</type>
70-
<value>//*/text()[normalize-space(.)='Please indicate if any of the following is relevant for the patient during the incubation period.']/parent::*</value>
70+
<value>//*/text()[normalize-space(.)='Exposure Investigation']/parent::*</value>
7171
</webElementXpaths>
7272
<webElementXpaths>
7373
<isSelected>false</isSelected>
7474
<matchCondition>equals</matchCondition>
7575
<name>xpath:position</name>
7676
<type>Main</type>
77-
<value>//i</value>
77+
<value>//h3/span</value>
7878
</webElementXpaths>
7979
</WebElementEntity>

‎sormas-e2e-ui-tests/Scripts/Samples/QuickFilter/Script1586925788053.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ WebUI.delay(1)
2929
int referredToOtherLab = Table.getNumberOfTableRows()
3030

3131
/*WebUI.click(findTestObject('Contacts/ContactsOverview/div_Show More Less Filters'))
32-
WebUI.click(findTestObject('Contacts/ContactsOverview/div_Apply date filter'))
32+
WebUI.click(findTestObject('Contacts/ContactsOverview/div_Apply date filter'))*/
3333
WebUI.click(findTestObject('Contacts/ContactsOverview/div_Reset filters'))
3434
WebUI.delay(1)
35-
int afterReset = Table.getNumberOfTableRows()*/
35+
int afterReset = Table.getNumberOfTableRows()
3636

3737
if (allRows != (notShipped + shipped)) {
3838
WebUI.closeBrowser()
3939
throw new StepFailedException('Expected the sum of shipped and not shipped rows to equal number of all rows. all: ' + allRows + ' shipped: ' + shipped + ' not-shipped: ' + notShipped)
4040
}
4141

42-
if (received > shipped) {
42+
/*if (received > shipped) {
4343
WebUI.closeBrowser()
4444
throw new StepFailedException('Expected the number of received samples to be less or equal to the number of shipped samples. received: ' + received + ' shipped: ' + shipped)
45-
}
45+
}*/
4646

47-
/*if (allRows != afterReset) {
47+
if (allRows != afterReset) {
4848
WebUI.closeBrowser()
4949
throw new StepFailedException('Expected the same number of rows before and after filtering. before: ' + allRows + ' after: ' + afterReset)
50-
}*/
50+
}
5151

5252
WebUI.closeBrowser()

‎sormas-e2e-ui-tests/Scripts/SurveillanceSupervisor/CreateContactForCase/Script1586174735244.groovy‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
22
import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
3+
4+
import com.hzi.Helper
35
import com.hzi.TestDataConnector as TestDataConnector
46
import com.kms.katalon.core.model.FailureHandling as FailureHandling
57
import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
@@ -23,16 +25,21 @@ firstName = TestDataConnector.getValueByKey('GenericUsers', 'first_name_contact'
2325

2426
WebUI.setText(findTestObject('Contacts/ContactsOverview/NewContact/input_First name'), firstName)
2527

26-
lastName = TestDataConnector.getValueByKey('GenericUsers', 'last_name_contact')
28+
// generate name because contacts cannot be deleted
29+
String randomLastName = Helper.generateString(firstName, 6)
30+
31+
println('generated lastname:' + randomLastName)
32+
//lastName = TestDataConnector.getValueByKey('GenericUsers', 'last_name_contact')
2733

28-
WebUI.setText(findTestObject('Contacts/ContactsOverview/NewContact/input_Last name'), lastName)
34+
WebUI.setText(findTestObject('Contacts/ContactsOverview/NewContact/input_Last name'), randomLastName)
2935

3036
WebUI.click(findTestObject('Object Repository/Contacts/ContactInformationView/ChangeContactPersonData/div_Sex_v-filterselect-button'))
3137

3238
WebUI.click(findTestObject('Contacts/ContactInformationView/ChangeContactPersonData/span_Male'))
3339

3440
WebUI.click(findTestObject('Surveillance/CaseView/Contacts/NewContact/div_RelationshipWithCase_DDBox'))
3541

42+
WebUI.scrollToElement(findTestObject('Surveillance/CaseView/Contacts/NewContact/span_RelationshipWithCase_LiveInTheSameHousehold_DDItem'), 1)
3643
WebUI.click(findTestObject('Surveillance/CaseView/Contacts/NewContact/span_RelationshipWithCase_LiveInTheSameHousehold_DDItem'))
3744

3845
WebUI.setText(findTestObject('Surveillance/CaseView/Contacts/NewContact/textarea_DescriptionOfHowContactTookPlace_TArea'),

‎sormas-e2e-ui-tests/Scripts/SurveillanceSupervisor/OpenCaseFromListAndValidateTheTabs/Script1585910465438.groovy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ WebUI.verifyElementPresent(findTestObject('Surveillance/CaseView/SymptomsTab/inp
2525

2626
WebUI.click(findTestObject('Surveillance/CaseView/div_Epidemiological data_tab'))
2727

28-
WebUI.verifyElementPresent(findTestObject('Surveillance/CaseView/Epidemiological data/i_EpidemiologicalData_description_text'),
29-
3)
28+
WebUI.verifyElementPresent(findTestObject('Surveillance/CaseView/Epidemiological data/span_Exposure Investigation'), 3)
3029

3130
WebUI.click(findTestObject('Surveillance/CaseView/div_Follow-up_tab'))
3231

‎sormas-e2e-ui-tests/Test Suites/Contacts/ContactInformation.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
2828
<isRun>true</isRun>
2929
<testCaseId>Test Cases/Contacts/CreateCancelNewCall</testCaseId>
3030
</testCaseLink>
31-
<testCaseLink>
32-
<guid>f4dd10c1-efc0-4272-8373-10bb3f80e48e</guid>
33-
<isReuseDriver>false</isReuseDriver>
34-
<isRun>true</isRun>
35-
<testCaseId>Test Cases/Contacts/CreateNewTaskForContact</testCaseId>
36-
</testCaseLink>
37-
<testCaseLink>
38-
<guid>dd02951c-deb0-485b-a057-748f4f4358d4</guid>
39-
<isReuseDriver>false</isReuseDriver>
40-
<isRun>true</isRun>
41-
<testCaseId>Test Cases/Contacts/CancelNewTaskForContact</testCaseId>
42-
</testCaseLink>
4331
<testCaseLink>
4432
<guid>a499b915-7484-4c13-a9fd-9b3ca05d80f8</guid>
4533
<isReuseDriver>false</isReuseDriver>
@@ -52,4 +40,10 @@
5240
<isRun>true</isRun>
5341
<testCaseId>Test Cases/Contacts/ChangeContactPersonData</testCaseId>
5442
</testCaseLink>
43+
<testCaseLink>
44+
<guid>e86f02bc-493b-4590-9af3-999237350fc1</guid>
45+
<isReuseDriver>false</isReuseDriver>
46+
<isRun>true</isRun>
47+
<testCaseId>Test Cases/Contacts/NewContactViaContactsView</testCaseId>
48+
</testCaseLink>
5549
</TestSuiteEntity>

sormas-e2e-ui-tests/Test Suites/AllTestsSuites.ts renamed to sormas-e2e-ui-tests/Test Suites/TestSuitesCollection.ts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<TestSuiteCollectionEntity>
33
<description>all in one for ci testing</description>
4-
<name>AllTestsSuites</name>
4+
<name>TestSuitesCollection</name>
55
<tag></tag>
66
<executionMode>SEQUENTIAL</executionMode>
77
<maxConcurrentInstances>8</maxConcurrentInstances>
@@ -13,7 +13,7 @@
1313
<runConfigurationId>Chrome (headless)</runConfigurationId>
1414
</configuration>
1515
<runEnabled>true</runEnabled>
16-
<testSuiteEntity>Test Suites/Contacts/ContactInformation</testSuiteEntity>
16+
<testSuiteEntity>Test Suites/Login/LoginRoles</testSuiteEntity>
1717
</TestSuiteRunConfiguration>
1818
<TestSuiteRunConfiguration>
1919
<configuration>
@@ -22,7 +22,7 @@
2222
<runConfigurationId>Chrome (headless)</runConfigurationId>
2323
</configuration>
2424
<runEnabled>true</runEnabled>
25-
<testSuiteEntity>Test Suites/Contacts/CreateNewContact</testSuiteEntity>
25+
<testSuiteEntity>Test Suites/Contacts/ContactInformation</testSuiteEntity>
2626
</TestSuiteRunConfiguration>
2727
<TestSuiteRunConfiguration>
2828
<configuration>
@@ -60,15 +60,6 @@
6060
<runEnabled>true</runEnabled>
6161
<testSuiteEntity>Test Suites/SuveillanceSupervisor Test Suite/Filter View</testSuiteEntity>
6262
</TestSuiteRunConfiguration>
63-
<TestSuiteRunConfiguration>
64-
<configuration>
65-
<groupName>Web Desktop</groupName>
66-
<profileName>test</profileName>
67-
<runConfigurationId>Chrome (headless)</runConfigurationId>
68-
</configuration>
69-
<runEnabled>true</runEnabled>
70-
<testSuiteEntity>Test Suites/Samples/Filter</testSuiteEntity>
71-
</TestSuiteRunConfiguration>
7263
<TestSuiteRunConfiguration>
7364
<configuration>
7465
<groupName>Web Desktop</groupName>
@@ -85,16 +76,7 @@
8576
<runConfigurationId>Chrome (headless)</runConfigurationId>
8677
</configuration>
8778
<runEnabled>true</runEnabled>
88-
<testSuiteEntity>Test Suites/Samples/Sample CRUD</testSuiteEntity>
89-
</TestSuiteRunConfiguration>
90-
<TestSuiteRunConfiguration>
91-
<configuration>
92-
<groupName>Web Desktop</groupName>
93-
<profileName>test</profileName>
94-
<runConfigurationId>Chrome (headless)</runConfigurationId>
95-
</configuration>
96-
<runEnabled>true</runEnabled>
97-
<testSuiteEntity>Test Suites/Events/Events_CRUD</testSuiteEntity>
79+
<testSuiteEntity>Test Suites/Samples/Filter</testSuiteEntity>
9880
</TestSuiteRunConfiguration>
9981
<TestSuiteRunConfiguration>
10082
<configuration>
@@ -103,7 +85,7 @@
10385
<runConfigurationId>Chrome (headless)</runConfigurationId>
10486
</configuration>
10587
<runEnabled>true</runEnabled>
106-
<testSuiteEntity>Test Suites/Login/LoginRoles</testSuiteEntity>
88+
<testSuiteEntity>Test Suites/Samples/Sample CRUD</testSuiteEntity>
10789
</TestSuiteRunConfiguration>
10890
<TestSuiteRunConfiguration>
10991
<configuration>
@@ -114,14 +96,5 @@
11496
<runEnabled>true</runEnabled>
11597
<testSuiteEntity>Test Suites/Tasks/AllTasks</testSuiteEntity>
11698
</TestSuiteRunConfiguration>
117-
<TestSuiteRunConfiguration>
118-
<configuration>
119-
<groupName>Web Desktop</groupName>
120-
<profileName>test</profileName>
121-
<runConfigurationId>Chrome (headless)</runConfigurationId>
122-
</configuration>
123-
<runEnabled>true</runEnabled>
124-
<testSuiteEntity>Test Suites/JenkinsSuite</testSuiteEntity>
125-
</TestSuiteRunConfiguration>
12699
</testSuiteRunConfigurations>
127100
</TestSuiteCollectionEntity>

0 commit comments

Comments
 (0)