Merge branch...

Merge branch '296872-the-epic-view-issue-list-does-not-show-issue-weights-when-set-to-0' into 'master'

Fix displaying weight of 0 for issues in epic tree

See merge request gitlab-org/gitlab!68914

ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue

@@ -7,7 +7,7 @@ import {
   GlButton,
   GlTooltip,
 } from '@gitlab/ui';
-import { isEmpty } from 'lodash';
+import { isEmpty, isNumber } from 'lodash';
 import { mapState, mapActions } from 'vuex';
 
 import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
@@ -75,6 +75,9 @@ export default {
     hasAssignees() {
       return this.item.assignees && this.item.assignees.length > 0;
     },
+    hasWeight() {
+      return isNumber(this.item.weight);
+    },
     stateText() {
       return this.isOpen ? __('Opened') : __('Closed');
     },
@@ -260,7 +263,7 @@ export default {
             />
 
             <item-weight
-              v-if="item.weight"
+              v-if="hasWeight"
               :weight="item.weight"
               class="item-weight gl-display-flex gl-align-items-center gl-mr-5!"
               tag-name="span"

ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js

 import { GlButton, GlLink, GlIcon } from '@gitlab/ui';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
 import Vuex from 'vuex';
 
 import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
@@ -28,8 +29,7 @@ import {
   mockEpicMeta3,
 } from '../mock_data';
 
-const localVue = createLocalVue();
-localVue.use(Vuex);
+Vue.use(Vuex);
 
 let mockItem;
 
@@ -68,7 +68,6 @@ const createComponent = (parentItem = mockParentItem, item = mockItem) => {
   });
 
   return shallowMount(TreeItemBody, {
-    localVue,
     store,
     propsData: {
       parentItem,
@@ -337,7 +336,7 @@ describe('RelatedItemsTree', () => {
       });
 
       it('renders item link', () => {
-        const link = wrapper.find(GlLink);
+        const link = wrapper.findComponent(GlLink);
 
         expect(link.attributes('href')).toBe(mockItem.webPath);
         expect(link.text()).toBe(mockItem.title);
@@ -350,13 +349,13 @@ describe('RelatedItemsTree', () => {
       });
 
       it('renders item milestone when it has milestone', () => {
-        const milestone = wrapper.find(ItemMilestone);
+        const milestone = wrapper.findComponent(ItemMilestone);
 
         expect(milestone.isVisible()).toBe(true);
       });
 
       it('renders item due date when it has due date', () => {
-        const dueDate = wrapper.find(ItemDueDate);
+        const dueDate = wrapper.findComponent(ItemDueDate);
 
         expect(dueDate.isVisible()).toBe(true);
       });
@@ -371,23 +370,39 @@ describe('RelatedItemsTree', () => {
 
         await wrapper.vm.$nextTick();
 
-        expect(wrapper.find(ItemDueDate).props('closed')).toBe(true);
+        expect(wrapper.findComponent(ItemDueDate).props('closed')).toBe(true);
       });
 
       it('renders item weight when it has weight', () => {
-        const weight = wrapper.find(ItemWeight);
+        const weight = wrapper.findComponent(ItemWeight);
 
         expect(weight.isVisible()).toBe(true);
       });
 
+      it('renders item weight when it has weight of 0', async () => {
+        wrapper.setProps({
+          item: {
+            ...mockItem,
+            weight: 0,
+          },
+        });
+
+        await wrapper.vm.$nextTick();
+
+        const weight = wrapper.findComponent(ItemWeight);
+
+        expect(weight.isVisible()).toBe(true);
+        expect(weight.props('weight')).toBe(0);
+      });
+
       it('renders item assignees when it has assignees', () => {
-        const assignees = wrapper.find(ItemAssignees);
+        const assignees = wrapper.findComponent(ItemAssignees);
 
         expect(assignees.isVisible()).toBe(true);
       });
 
       it('renders item remove button when `item.userPermissions.adminEpic` is true', () => {
-        const removeButton = wrapper.find(GlButton);
+        const removeButton = wrapper.findComponent(GlButton);
 
         expect(removeButton.isVisible()).toBe(true);
         expect(removeButton.attributes('title')).toBe('Remove');