Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 1 deletions

diff --git a/spec/frontend/vue_shared/components/dropdown/dropdown_widget_spec.js b/spec/frontend/vue_shared/components/dropdown/dropdown_widget_spec.js
index 929bd34c10f..016fe1f131e 100644
--- a/spec/frontend/vue_shared/components/dropdown/dropdown_widget_spec.js
+++ b/spec/frontend/vue_shared/components/dropdown/dropdown_widget_spec.js
@@ -13,7 +13,6 @@ describe('DropdownWidget component', () => {
   const createComponent = ({ props = {} } = {}) => {
     wrapper = shallowMount(DropdownWidget, {
       propsData: {
-        ...props,
         options: [
           {
             id: '1',
@@ -24,6 +23,7 @@ describe('DropdownWidget component', () => {
             title: 'Option 2',
           },
         ],
+        ...props,
       },
       stubs: {
         GlDropdown,
@@ -76,4 +76,22 @@ describe('DropdownWidget component', () => {
       expect(wrapper.emitted('set-option')).toEqual([[wrapper.props().options[1]]]);
     });
   });
+
+  describe('when options are users', () => {
+    const mockUser = {
+      id: 1,
+      name: 'User name',
+      username: 'username',
+      avatarUrl: 'foo/bar',
+    };
+
+    beforeEach(() => {
+      createComponent({ props: { options: [mockUser] } });
+    });
+
+    it('passes user related props to dropdown item', () => {
+      expect(findDropdownItems().at(0).props('avatarUrl')).toBe(mockUser.avatarUrl);
+      expect(findDropdownItems().at(0).props('secondaryText')).toBe(mockUser.username);
+    });
+  });
 });