Commit 3b1a8873 authored by Eulyeon Ko's avatar Eulyeon Ko

Apply frontend reviewer suggestions

parent 4c458201
......@@ -333,9 +333,12 @@ export default {
data-testid="new-column-iteration-item"
>
{{ iteration.period }}
<div v-if="getIterationTitle(iteration)" data-testid="new-column-iteration-title">
<iteration-title>{{ getIterationTitle(iteration) }}</iteration-title>
</div>
<iteration-title
v-if="getIterationTitle(iteration)"
data-testid="new-column-iteration-title"
>
{{ getIterationTitle(iteration) }}
</iteration-title>
</gl-form-radio>
</gl-dropdown-text>
</div>
......@@ -378,9 +381,12 @@ export default {
data-testid="new-column-iteration-item"
>
{{ getIterationPeriod(item) }}
<div v-if="getIterationTitle(item)" data-testid="new-column-iteration-title">
<iteration-title>{{ getIterationTitle(item) }}</iteration-title>
</div>
<iteration-title
v-if="getIterationTitle(item)"
data-testid="new-column-iteration-title"
>
{{ getIterationTitle(item) }}
</iteration-title>
</div>
<div v-else class="gl-display-inline-block">
{{ item.title }}
......
......@@ -14,7 +14,7 @@ export function getIterationPeriod({ startDate, dueDate }) {
}
export function getIterationTitle(iteration) {
return iteration?.title ? iteration.title : false;
return iteration?.title;
}
/**
......
......@@ -110,12 +110,12 @@ describe('BoardAddNewColumn', () => {
await nextTick();
};
const testIterationWithTitle = () => {
const expectIterationWithTitle = () => {
expect(findIterationItemAt(1).text()).toContain(getIterationPeriod(mockIterations[1]));
expect(findIterationItemAt(1).text()).toContain(mockIterations[1].title);
};
const testIterationWithoutTitle = () => {
const expectIterationWithoutTitle = () => {
expect(findIterationItemAt(0).text()).toContain(getIterationPeriod(mockIterations[0]));
expect(findIterationItemAt(0).find("[data-testid='new-column-iteration-title']").exists()).toBe(
false,
......@@ -250,8 +250,8 @@ describe('BoardAddNewColumn', () => {
const itemList = wrapper.findComponent(GlDropdown).findAllComponents(GlFormRadio);
expect(itemList).toHaveLength(mockIterations.length);
testIterationWithoutTitle();
testIterationWithTitle();
expectIterationWithoutTitle();
expectIterationWithTitle();
});
});
......@@ -285,8 +285,8 @@ describe('BoardAddNewColumn', () => {
});
it('displays iteration period optionally with title', async () => {
testIterationWithoutTitle();
testIterationWithTitle();
expectIterationWithoutTitle();
expectIterationWithTitle();
});
});
});
import { mount, createLocalVue } from '@vue/test-utils';
import { mount } from '@vue/test-utils';
import VueApollo from 'vue-apollo';
import Vue from 'vue';
import IterationSidebarDropdownWidget from 'ee/sidebar/components/iteration_sidebar_dropdown_widget.vue';
import createMockApollo from 'helpers/mock_apollo_helper';
import { extendedWrapper } from 'helpers/vue_test_utils_helper';
......@@ -18,7 +19,7 @@ import {
} from '../mock_data';
import { waitForApollo, clickEdit, search } from '../helpers';
const localVue = createLocalVue();
Vue.use(VueApollo);
describe('IterationSidebarDropdownWidget', () => {
let wrapper;
......@@ -33,7 +34,6 @@ describe('IterationSidebarDropdownWidget', () => {
iterationCadences = false,
currentIterationResponse = mockCurrentIterationResponse1,
} = {}) => {
localVue.use(VueApollo);
mockApollo = createMockApollo([
[groupIterationsQuery, jest.fn().mockResolvedValue(mockGroupIterationsResponse)],
[projectIssueIterationQuery, jest.fn().mockResolvedValue(currentIterationResponse)],
......@@ -41,7 +41,6 @@ describe('IterationSidebarDropdownWidget', () => {
wrapper = extendedWrapper(
mount(IterationSidebarDropdownWidget, {
localVue,
provide: {
glFeatures: { iterationCadences },
issuableAttributesQueries,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment