Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 9 deletions

diff --git a/spec/frontend/emoji/components/category_spec.js b/spec/frontend/emoji/components/category_spec.js
index 90816f28d5b..6861059f19c 100644
--- a/spec/frontend/emoji/components/category_spec.js
+++ b/spec/frontend/emoji/components/category_spec.js
@@ -9,6 +9,11 @@ function factory(propsData = {}) {
   wrapper = shallowMount(Category, { propsData });
 }
 
+const triggerGlIntersectionObserver = () => {
+  wrapper.findComponent(GlIntersectionObserver).vm.$emit('appear');
+  return nextTick();
+};
+
 describe('Emoji category component', () => {
   afterEach(() => {
     wrapper.destroy();
@@ -26,25 +31,19 @@ describe('Emoji category component', () => {
   });
 
   it('renders group', async () => {
-    // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
-    // eslint-disable-next-line no-restricted-syntax
-    await wrapper.setData({ renderGroup: true });
+    await triggerGlIntersectionObserver();
 
     expect(wrapper.findComponent(EmojiGroup).attributes('rendergroup')).toBe('true');
   });
 
   it('renders group on appear', async () => {
-    wrapper.findComponent(GlIntersectionObserver).vm.$emit('appear');
-
-    await nextTick();
+    await triggerGlIntersectionObserver();
 
     expect(wrapper.findComponent(EmojiGroup).attributes('rendergroup')).toBe('true');
   });
 
   it('emits appear event on appear', async () => {
-    wrapper.findComponent(GlIntersectionObserver).vm.$emit('appear');
-
-    await nextTick();
+    await triggerGlIntersectionObserver();
 
     expect(wrapper.emitted().appear[0]).toEqual(['Activity']);
   });