.......... [ZBXNEXT-686] fixed Selenium tests, added missing waits, removed duplicate test scenario

4 files changed, 2 insertions, 18 deletions

diff --git a/ui/tests/include/web/CPage.php b/ui/tests/include/web/CPage.php
index 2f44f6e34d7..78dc85b2d4f 100644
--- a/ui/tests/include/web/CPage.php
+++ b/ui/tests/include/web/CPage.php
@@ -219,7 +219,6 @@ class CPage {
 			self::$cookie = [
 				'name' => 'zbx_session',
 				'value' => base64_encode(json_encode($data)),
-				'domain' => parse_url(PHPUNIT_URL, PHP_URL_HOST),
 				'path' => rtrim(substr($path, 0, strrpos($path, '/')), '/')
 			];
 
diff --git a/ui/tests/selenium/dashboard/testDashboardPages.php b/ui/tests/selenium/dashboard/testDashboardPages.php
index 5cb853ead37..5e22be9157b 100644
--- a/ui/tests/selenium/dashboard/testDashboardPages.php
+++ b/ui/tests/selenium/dashboard/testDashboardPages.php
@@ -456,6 +456,7 @@ class testDashboardPages extends CWebTest {
 		$dashboard->addPage();
 		$page_dialog = COverlayDialogElement::find()->waitUntilReady()->one();
 		$page_dialog->query('name:dashboard_page_properties_form')->asForm()->one()->fill($data['fields'])->submit();
+		$page_dialog->ensureNotPresent();
 		$dashboard->waitUntilReady();
 
 		$title = $data['fields']['Name'];
diff --git a/ui/tests/selenium/dashboard/testDashboardTriggerOverviewWidget.php b/ui/tests/selenium/dashboard/testDashboardTriggerOverviewWidget.php
index e4e415c9a96..14ae924ba1e 100644
--- a/ui/tests/selenium/dashboard/testDashboardTriggerOverviewWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardTriggerOverviewWidget.php
@@ -415,21 +415,6 @@ class testDashboardTriggerOverviewWidget extends CWebTest {
 			[
 				[
 					'fields' => [
-						'Name' => 'Filter triggers by tag with default operator'
-					],
-					'tags' => [
-						['name' => 'server', 'operator' => 'Contains', 'value' => 'sel']
-					],
-					'expected' => [
-						'Host for triggers filtering' => [
-							'Inheritance trigger with tags'
-						]
-					]
-				]
-			],
-			[
-				[
-					'fields' => [
 						'Name' => 'Filter triggers by 2 tags with Or operator',
 						'Tags' => 'Or'
 					],
@@ -795,7 +780,6 @@ class testDashboardTriggerOverviewWidget extends CWebTest {
 
 		$widget_name = (array_key_exists('fields', $data)) ? $data['fields']['Name'] : 'Trigger overview';
 		$widget = $dashboard->getWidget($widget_name);
-		$widget->query('xpath://div[contains(@class, "is-loading")]')->waitUntilNotPresent();
 		$dashboard->save();
 		$this->assertMessage(TEST_GOOD, 'Dashboard updated');
 
diff --git a/ui/tests/selenium/testInheritanceHostPrototype.php b/ui/tests/selenium/testInheritanceHostPrototype.php
index 1159776a384..da55d087de4 100644
--- a/ui/tests/selenium/testInheritanceHostPrototype.php
+++ b/ui/tests/selenium/testInheritanceHostPrototype.php
@@ -456,7 +456,7 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
 		if (array_key_exists('template', $data)) {
 			$this->zbxTestClickButtonMultiselect('add_templates_');
 			$this->zbxTestLaunchOverlayDialog('Templates');
-			COverlayDialogElement::find()->one()->setDataContext('Templates');
+			COverlayDialogElement::find()->waitUntilReady()->one()->setDataContext('Templates');
 			$this->zbxTestClickLinkTextWait($data['template']);
 		}