Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index d2732eb7dd2..8f5632f7e6e 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -161,7 +161,15 @@ module QA
 
           def select_user(username)
             find("#{element_selector_css(:assignee_block)} input").set(username)
-            find('.dropdown-menu-user-link', text: "@#{username}").click
+
+            dropdown_menu_user_link_selector = '.dropdown-menu-user-link'
+            at_username = "@#{username}"
+            ten_seconds = 10
+
+            wait(reload: false, max: ten_seconds, interval: 1) do
+              has_css?(dropdown_menu_user_link_selector, wait: ten_seconds, text: at_username)
+            end
+            find(dropdown_menu_user_link_selector, text: at_username).click
           end
 
           def wait_assignees_block_finish_loading