.......... [DEV-1800] changed select method for z-dropdown in autotest framework4.0.28

1 files changed, 6 insertions, 17 deletions

diff --git a/frontends/php/tests/include/web/elements/CZDropdownElement.php b/frontends/php/tests/include/web/elements/CZDropdownElement.php
index d6bffc31983..d5ad71995f7 100644
--- a/frontends/php/tests/include/web/elements/CZDropdownElement.php
+++ b/frontends/php/tests/include/web/elements/CZDropdownElement.php
@@ -22,8 +22,6 @@ require_once 'vendor/autoload.php';
 
 require_once dirname(__FILE__).'/../CElement.php';
 
-use Facebook\WebDriver\Exception\TimeoutException;
-
 /**
  * Custom dropdown (z-select) element.
  */
@@ -61,28 +59,19 @@ class CZDropdownElement extends CElement {
 			return $this;
 		}
 
-		for ($i = 0; $i < 2; $i++) {
+		for ($i = 0; $i < 5; $i++) {
 			try {
 				$this->waitUntilClickable()->click();
-				$option = $this->query($xpath)->waitUntilClickable()->one();
+				$this->query($xpath)->one()->click();
 
-				break;
+				return $this;
 			}
-			catch (TimeoutException $exception) {
-				if ($i === 1) {
-					throw new Exception('Failed to wait for the dropdown options to be present.');
-				}
+			catch (Exception $exception) {
+				// Code is not missing here.
 			}
 		}
 
-		if ($option->isClickable()) {
-			$option->click();
-		}
-		else {
-			throw new Exception('Cannot select disabled dropdown element.');
-		}
-
-		return $this;
+		throw new Exception('Failed to select dropdown option "'.$text.'".');
 	}
 
 	/**