From 38e4bfea582e8c755dd21613bf21658b1771449b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 29 Apr 2021 09:10:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/users_select/test_helper.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'spec/frontend/users_select') diff --git a/spec/frontend/users_select/test_helper.js b/spec/frontend/users_select/test_helper.js index 89bbbba9913..c5adbe9bb09 100644 --- a/spec/frontend/users_select/test_helper.js +++ b/spec/frontend/users_select/test_helper.js @@ -1,7 +1,7 @@ -import { waitFor } from '@testing-library/dom'; import MockAdapter from 'axios-mock-adapter'; import { memoize, cloneDeep } from 'lodash'; import { getFixture, getJSONFixture } from 'helpers/fixtures'; +import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import UsersSelect from '~/users_select'; @@ -103,8 +103,10 @@ export const setAssignees = (...users) => { ); }; export const toggleDropdown = () => findUserSearchButton().click(); -export const waitForDropdownItems = () => - waitFor(() => expect(findDropdownItem(getUsersFixtureAt(0))).not.toBeNull()); +export const waitForDropdownItems = async () => { + await axios.waitForAll(); + await waitForPromises(); +}; // assertion helpers --------------------------------------------------------- export const createUnassignedExpectation = () => { -- cgit v1.2.3