SORMAS-Foundation#3262 fixed errors related to modal window

Author: raghupola-vg

sormas-e2e-ui-tests/Scripts/Samples/CreateNewSampleInCaseView/Script1586165795257.groovy

@@ -1,26 +1,29 @@
 import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
 import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
-
 import com.hzi.Helper as Helper
-import com.hzi.Table
+import com.hzi.Table as Table
 import com.hzi.TestDataConnector as TestDataConnector
-import com.kms.katalon.core.exception.StepFailedException
+import com.kms.katalon.core.exception.StepFailedException as StepFailedException
 import com.kms.katalon.core.model.FailureHandling as FailureHandling
 import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
 
 WebUI.callTestCase(findTestCase('Login/partials/LoginAsSurveillanceSupervisor'), [:], FailureHandling.STOP_ON_FAILURE)
 
 WebUI.callTestCase(findTestCase('Samples/partials/switchToSamples'), [:], FailureHandling.STOP_ON_FAILURE)
+
 int numberOfSamples = Table.getNumberOfTableRows()
 
 WebUI.callTestCase(findTestCase('SurveillanceSupervisor/partials/SwitchToCases'), [:], FailureHandling.STOP_ON_FAILURE)
 
 String firstName = TestDataConnector.getValueByKey('GenericUsers', 'first_name_case')
+
 String lastName = TestDataConnector.getValueByKey('GenericUsers', 'last_name_case')
 
-WebUI.callTestCase(findTestCase('SurveillanceSupervisor/partials/FilterCaseByPersonName'), [('personName') : firstName + ' ' + lastName], FailureHandling.STOP_ON_FAILURE)
+WebUI.callTestCase(findTestCase('SurveillanceSupervisor/partials/FilterCaseByPersonName'), [('personName') : (firstName + 
+        ' ') + lastName], FailureHandling.STOP_ON_FAILURE)
 
 WebUI.click(findTestObject('Surveillance/CaseView/Sample/div_NewSample_btn'))
+
 WebUI.waitForElementPresent(findTestObject('Surveillance/CaseView/Sample/input_DateSampleWasCollected_date'), 2)
 
 WebUI.setText(findTestObject('Surveillance/CaseView/Sample/input_DateSampleWasCollected_date'), '01/04/2020')
@@ -39,19 +42,21 @@ WebUI.click(findTestObject('Surveillance/CaseView/Sample/div_Laboratory_DDBox'))
 WebUI.click(findTestObject('Surveillance/CaseView/Sample/td_Voreingestelltes Labor'))
 
 //WebUI.click(findTestObject('Surveillance/CaseView/Sample/label_PathogenTest_No_option'))
-
 WebUI.setText(findTestObject('Surveillance/CaseView/Sample/textarea_Comment_TArea'), Helper.generateString('comment', 6))
 
-WebUI.click(findTestObject('ReusableORs/div_Save'))
+WebUI.click(findTestObject('ReusableORs/div_Save_modalWindow'))
 
 WebUI.delay(1)
 
 WebUI.callTestCase(findTestCase('Samples/partials/switchToSamples'), [:], FailureHandling.STOP_ON_FAILURE)
+
 int newNumberOfSamples = Table.getNumberOfTableRows()
 
-if (newNumberOfSamples != (numberOfSamples + 1 )) {
-	WebUI.closeBrowser()
-	throw new StepFailedException('Expected that the number of samples is increased by one. expected: ' + (numberOfSamples + 1) + ' found: ' + newNumberOfSamples)
+if (newNumberOfSamples != (numberOfSamples + 1)) {
+    WebUI.closeBrowser()
+
+    throw new StepFailedException((('Expected that the number of samples is increased by one. expected: ' + (numberOfSamples + 
+    1)) + ' found: ') + newNumberOfSamples)
 }
 
 if (isStandalone) {

sormas-e2e-ui-tests/Scripts/SurveillanceSupervisor/CreateNewTaskInCaseView/Script1586165807215.groovy

@@ -1,6 +1,5 @@
 import static com.kms.katalon.core.testcase.TestCaseFactory.findTestCase
 import static com.kms.katalon.core.testobject.ObjectRepository.findTestObject
-
 import com.hzi.Helper as Helper
 import com.hzi.TestDataConnector as TestDataConnector
 import com.kms.katalon.core.model.FailureHandling as FailureHandling
@@ -31,7 +30,7 @@ WebUI.click(findTestObject('Surveillance/CaseView/Task/span_Surveillance SUPERVI
 
 WebUI.setText(findTestObject('Surveillance/CaseView/Task/textarea_Comment_TArea'), Helper.generateString('comment', 5))
 
-WebUI.click(findTestObject('ReusableORs/div_Save'))
+WebUI.click(findTestObject('ReusableORs/div_Save_modalWindow'))
 
 WebUI.delay(1)
 

sormas-e2e-ui-tests/settings/internal/com.kms.katalon.composer.testcase.properties

@@ -1,2 +1,2 @@
-#Mon Nov 16 14:07:07 CET 2020
+#Mon Nov 16 18:38:47 CET 2020
 testCaseTag="TODO"