Add latest changes from gitlab-org/gitlab@master

2 files changed, 58 insertions, 3 deletions

diff --git a/spec/frontend/helpers/vue_test_utils_helper.js b/spec/frontend/helpers/vue_test_utils_helper.js
index ead898f04d3..0e9127b5c65 100644
--- a/spec/frontend/helpers/vue_test_utils_helper.js
+++ b/spec/frontend/helpers/vue_test_utils_helper.js
@@ -1,3 +1,5 @@
+import { isArray } from 'lodash';
+
 const vNodeContainsText = (vnode, text) =>
   (vnode.text && vnode.text.includes(text)) ||
   (vnode.children && vnode.children.filter(child => vNodeContainsText(child, text)).length);
@@ -34,9 +36,18 @@ export const waitForMutation = (store, expectedMutationType) =>
     });
   });
 
-export const extendedWrapper = wrapper =>
-  Object.defineProperty(wrapper, 'findByTestId', {
+export const extendedWrapper = wrapper => {
+  if (isArray(wrapper) || !wrapper?.find) {
+    // eslint-disable-next-line no-console
+    console.warn(
+      '[vue-test-utils-helper]: you are trying to extend an object that is not a VueWrapper.',
+    );
+    return wrapper;
+  }
+
+  return Object.defineProperty(wrapper, 'findByTestId', {
     value(id) {
       return this.find(`[data-testid="${id}"]`);
     },
   });
+};
diff --git a/spec/frontend/helpers/vue_test_utils_helper_spec.js b/spec/frontend/helpers/vue_test_utils_helper_spec.js
index 41714066da5..31c4ccd5dbb 100644
--- a/spec/frontend/helpers/vue_test_utils_helper_spec.js
+++ b/spec/frontend/helpers/vue_test_utils_helper_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
-import { shallowWrapperContainsSlotText } from './vue_test_utils_helper';
+import { extendedWrapper, shallowWrapperContainsSlotText } from './vue_test_utils_helper';
 
 describe('Vue test utils helpers', () => {
   describe('shallowWrapperContainsSlotText', () => {
@@ -45,4 +45,48 @@ describe('Vue test utils helpers', () => {
       expect(shallowWrapperContainsSlotText(mockComponent, 'namedSlot', searchText)).toBe(false);
     });
   });
+
+  describe('extendedWrapper', () => {
+    describe('when an invalid wrapper is provided', () => {
+      beforeEach(() => {
+        // eslint-disable-next-line no-console
+        console.warn = jest.fn();
+      });
+
+      it.each`
+        wrapper
+        ${{}}
+        ${[]}
+        ${null}
+        ${undefined}
+        ${1}
+        ${''}
+      `('should warn with an error when the wrapper is $wrapper', ({ wrapper }) => {
+        extendedWrapper(wrapper);
+        /* eslint-disable no-console */
+        expect(console.warn).toHaveBeenCalled();
+        expect(console.warn).toHaveBeenCalledWith(
+          '[vue-test-utils-helper]: you are trying to extend an object that is not a VueWrapper.',
+        );
+        /* eslint-enable no-console */
+      });
+    });
+
+    describe('findByTestId', () => {
+      const testId = 'a-component';
+      let mockComponent;
+
+      beforeEach(() => {
+        mockComponent = extendedWrapper(
+          shallowMount({
+            template: `<div data-testid="${testId}"></div>`,
+          }),
+        );
+      });
+
+      it('should find the component by test id', () => {
+        expect(mockComponent.findByTestId(testId).exists()).toBe(true);
+      });
+    });
+  });
 });