From b595cb0c1dec83de5bdee18284abe86614bed33b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Jul 2022 15:40:28 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-2-stable-ee --- spec/frontend/user_popovers_spec.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'spec/frontend/user_popovers_spec.js') diff --git a/spec/frontend/user_popovers_spec.js b/spec/frontend/user_popovers_spec.js index 1544fed5240..b171c8fc9ed 100644 --- a/spec/frontend/user_popovers_spec.js +++ b/spec/frontend/user_popovers_spec.js @@ -12,12 +12,8 @@ jest.mock('~/api/user_api', () => ({ describe('User Popovers', () => { const fixtureTemplate = 'merge_requests/merge_request_with_mentions.html'; - const selector = '.js-user-link, .gfm-project_member'; - const findFixtureLinks = () => { - return Array.from(document.querySelectorAll(selector)).filter( - ({ dataset }) => dataset.user || dataset.userId, - ); - }; + const selector = '.js-user-link[data-user], .js-user-link[data-user-id]'; + const findFixtureLinks = () => Array.from(document.querySelectorAll(selector)); const createUserLink = () => { const link = document.createElement('a'); @@ -95,6 +91,24 @@ describe('User Popovers', () => { }); }); + it('does not initialize the popovers for group references', async () => { + const [groupLink] = Array.from(document.querySelectorAll('.js-user-link[data-group]')); + + triggerEvent('mouseover', groupLink); + jest.runOnlyPendingTimers(); + + expect(findPopovers().length).toBe(0); + }); + + it('does not initialize the popovers for @all references', async () => { + const [projectLink] = Array.from(document.querySelectorAll('.js-user-link[data-project]')); + + triggerEvent('mouseover', projectLink); + jest.runOnlyPendingTimers(); + + expect(findPopovers().length).toBe(0); + }); + it('does not initialize the user popovers twice for the same element', async () => { const [firstUserLink] = findFixtureLinks(); triggerEvent('mouseover', firstUserLink); -- cgit v1.2.1