From e506310ea0fa065d62b207b73dbc7adab231f48f Mon Sep 17 00:00:00 2001
From: Vitaly Kramskikh <vkramskikh@mirantis.com>
Date: Fri, 11 Mar 2016 16:56:13 +0300
Subject: [PATCH] Fix random test failures for specific browser/screen
 combinations

Related-Bug: #1549750

Change-Id: Ia1a9060b8d7d490db35f817598b26761e290a3b2
---
 static/tests/functional/pages/dashboard.js            | 3 ++-
 static/tests/functional/test_cluster_dashboard.js     | 3 ++-
 static/tests/functional/test_cluster_page.js          | 9 ++++++++-
 static/tests/functional/test_node_management_panel.js | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/static/tests/functional/pages/dashboard.js b/static/tests/functional/pages/dashboard.js
index 477897e6e..498d89e38 100644
--- a/static/tests/functional/pages/dashboard.js
+++ b/static/tests/functional/pages/dashboard.js
@@ -76,7 +76,8 @@ define([
           .type(name)
           // Enter
           .type('\uE007')
-          .end();
+          .end()
+        .waitForElementDeletion('.rename-block input[type=text]', 2000);
     },
     discardChanges: function() {
       var self = this;
diff --git a/static/tests/functional/test_cluster_dashboard.js b/static/tests/functional/test_cluster_dashboard.js
index 69837f44f..ffa8fdcb5 100644
--- a/static/tests/functional/test_cluster_dashboard.js
+++ b/static/tests/functional/test_cluster_dashboard.js
@@ -67,7 +67,8 @@ define([
             // Escape
             .type('\uE00C')
             .end()
-          .assertElementNotExists(renameInputSelector, 'Rename control disappears')
+          .assertElementDisappears(renameInputSelector, 'Rename control disappears')
+          .assertElementAppears(nameSelector, 'Cluster name appears')
           .assertElementTextEquals(
             nameSelector,
             initialName,
diff --git a/static/tests/functional/test_cluster_page.js b/static/tests/functional/test_cluster_page.js
index 690d85809..eadf1e43d 100644
--- a/static/tests/functional/test_cluster_page.js
+++ b/static/tests/functional/test_cluster_page.js
@@ -71,11 +71,18 @@ define([
             })
             .end()
           // the following timeout as we have 0.5s transition time for role popover
-          .sleep(600)
+          .sleep(1000)
           .assertElementExists(
             '.role-block.mongo .popover .text-warning',
             'Role popover is opened and the role warning is shown in the popover'
           )
+          // closing role popover by moving mouse
+          .findByCssSelector('.page-title')
+            .then(function(element) {
+              return self.remote.moveMouseTo(element);
+            })
+            .end()
+          .sleep(500)
           .then(function() {
             return clusterPage.checkNodeRoles(['Controller', 'Cinder']);
           })
diff --git a/static/tests/functional/test_node_management_panel.js b/static/tests/functional/test_node_management_panel.js
index a93edf745..7a0d68323 100644
--- a/static/tests/functional/test_node_management_panel.js
+++ b/static/tests/functional/test_node_management_panel.js
@@ -97,7 +97,7 @@ define([
             .assertElementsExist('.node-list .node', 4, 'Search was reset')
             .assertElementNotExists(searchButtonSelector,
               'Search input is still shown after search reset')
-            .clickByCssSelector('.node-list')
+            .clickByCssSelector('.page-title')
             .assertElementExists(searchButtonSelector,
               'Empty search control is closed when clicking outside the input');
         },