Merge remote-tracking branch 'origin/development' into 3416_SurvNet-nosocomial-outbreak

Author: lgal

sormas-e2e-ui-tests/Scripts/Contacts/NewContactViaContactsView/Script1586946842046.groovy

@@ -68,9 +68,9 @@ WebUI.click(findTestObject('Contacts/ContactsOverview/NewContact/span_Contacts l
 
 WebUI.setText(findTestObject('Contacts/ContactsOverview/input_New contact_nameUuidCaseLike'), newContactLastName)
 
-WebUI.click(findTestObject('Contacts/ContactsOverview/div_Show More Less Filters'))
+/*WebUI.click(findTestObject('Contacts/ContactsOverview/div_Show More Less Filters'))
 
-WebUI.click(findTestObject('ReusableORs/Filters/span_Include contacts from other jurisdictions'))
+WebUI.click(findTestObject('ReusableORs/Filters/span_Include contacts from other jurisdictions'))*/
 
 WebUI.click(findTestObject('Contacts/ContactsOverview/div_Apply filters'))
 
@@ -79,9 +79,18 @@ WebUI.delay(1)
 int numberOfRows = Table.getNumberOfTableRows()
 
 if (numberOfRows != 1) {
+	WebUI.click(findTestObject('Contacts/ContactsOverview/div_Show More Less Filters'))
+	
+	WebUI.click(findTestObject('ReusableORs/Filters/span_Include contacts from other jurisdictions'))
+	
+	WebUI.click(findTestObject('Contacts/ContactsOverview/div_Apply filters'))
+	int numberOfUpdatedRows = Table.getNumberOfTableRows()
+	
+	if (numberOfUpdatedRows != 1){
     WebUI.closeBrowser()
     throw new StepFailedException('Expected one contact: ' + numberOfRows)
 }
+}
 
 WebUI.closeBrowser()
 

sormas-e2e-ui-tests/Scripts/Login/partials/LoginActions/Script1585642814653.groovy

@@ -5,14 +5,15 @@ import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
 import internal.GlobalVariable as GlobalVariable
 
 // check if browser is already opened, if a testcase needs to change some profile properties it automatically would open a browser
-try {
+/*try {
 	WebUI.navigateToUrl(GlobalVariable.gUrl)
 } catch(BrowserNotOpenedException){
 	WebUI.openBrowser('')
 	WebUI.navigateToUrl(GlobalVariable.gUrl)
-}
+}*/
 
-// WebUI.openBrowser(GlobalVariable.gUrl)
+WebUI.openBrowser('')
+WebUI.navigateToUrl(GlobalVariable.gUrl)
 
 WebUI.setText(findTestObject('Login/input_username_username'), Username)