From d83c512077b9eb391ce1f59349fc7bacc3615e18 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 2 Jan 2020 15:07:40 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../vue_shared/components/dropdown/dropdown_search_input_spec.js      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'spec/frontend/vue_shared/components/dropdown')

diff --git a/spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js b/spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js
index 0d0e4ae4349..ffdeb25439c 100644
--- a/spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js
+++ b/spec/frontend/vue_shared/components/dropdown/dropdown_search_input_spec.js
@@ -49,7 +49,9 @@ describe('DropdownSearchInputComponent', () => {
 
       wrapper.setProps({ focused: true });
 
-      expect(inputEl.focus).toHaveBeenCalled();
+      return wrapper.vm.$nextTick().then(() => {
+        expect(inputEl.focus).toHaveBeenCalled();
+      });
     });
   });
 });
-- 
cgit v1.2.1