Commit d069b4d3 authored by Eulyeon Ko's avatar Eulyeon Ko

Fix bulk edit iteration dropdown

The bulk edit iteration dropdown should
display iteration dates when an iteration
is selected.
parent 76559731
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
return groupByIterationCadences(this.iterations); return groupByIterationCadences(this.iterations);
}, },
dropdownSelectedText() { dropdownSelectedText() {
return this.currentIteration?.period return this.currentIteration?.startDate || this.currentIteration?.period
? this.getIterationPeriod(this.currentIteration) ? this.getIterationPeriod(this.currentIteration)
: __('Select iteration'); : __('Select iteration');
}, },
......
...@@ -84,6 +84,7 @@ describe('IterationDropdown', () => { ...@@ -84,6 +84,7 @@ describe('IterationDropdown', () => {
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
jest.runOnlyPendingTimers(); jest.runOnlyPendingTimers();
}; };
const findDropdownItems = () => wrapper.findAllComponents(GlDropdownItem); const findDropdownItems = () => wrapper.findAllComponents(GlDropdownItem);
const findDropdownItemsAt = (i) => findDropdownItems().at(i); const findDropdownItemsAt = (i) => findDropdownItems().at(i);
const findDropdownItemWithText = (text) => const findDropdownItemWithText = (text) =>
...@@ -206,22 +207,26 @@ describe('IterationDropdown', () => { ...@@ -206,22 +207,26 @@ describe('IterationDropdown', () => {
describe.each([ describe.each([
{ {
text: IterationDropdown.noIteration.text, text: IterationDropdown.noIteration.text,
dropdownText: 'Select iteration',
iteration: IterationDropdown.noIteration, iteration: IterationDropdown.noIteration,
}, },
{ {
text: getIterationPeriod(TEST_ITERATIONS[0]), text: getIterationPeriod(TEST_ITERATIONS[0]),
dropdownText: getIterationPeriod(TEST_ITERATIONS[0]),
iteration: TEST_ITERATIONS[0], iteration: TEST_ITERATIONS[0],
}, },
{ {
text: getIterationPeriod(TEST_ITERATIONS[1]), text: getIterationPeriod(TEST_ITERATIONS[1]),
dropdownText: getIterationPeriod(TEST_ITERATIONS[1]),
iteration: TEST_ITERATIONS[1], iteration: TEST_ITERATIONS[1],
}, },
])("when iteration '%s' is selected", ({ text, iteration }) => { ])("when iteration '%s' is selected", ({ text, dropdownText, iteration }) => {
beforeEach(async () => { beforeEach(async () => {
await selectDropdownItemAndWait(text); await selectDropdownItemAndWait(text);
}); });
it('shows item as checked and emits event', () => { it('shows item as checked with text and emits event', () => {
expect(findDropdown().props('text')).toBe(dropdownText);
expect(findDropdownItemWithText(text).props('isChecked')).toBe(true); expect(findDropdownItemWithText(text).props('isChecked')).toBe(true);
expect(wrapper.emitted('onIterationSelect')).toEqual([[iteration]]); expect(wrapper.emitted('onIterationSelect')).toEqual([[iteration]]);
}); });
...@@ -285,15 +290,15 @@ describe('IterationDropdown', () => { ...@@ -285,15 +290,15 @@ describe('IterationDropdown', () => {
expect(dropdownItems.at(2).findComponent(GlDropdownDivider).exists()).toBe(true); expect(dropdownItems.at(2).findComponent(GlDropdownDivider).exists()).toBe(true);
expect(dropdownItems.at(3).findComponent(GlDropdownSectionHeader).text()).toBe('My Cadence'); expect(dropdownItems.at(3).findComponent(GlDropdownSectionHeader).text()).toBe('My Cadence');
expect(dropdownItems.at(4).text()).toContain('Oct 1, 2021 - Oct 5, 2021'); expect(dropdownItems.at(4).text()).toContain(getIterationPeriod(TEST_ITERATIONS[0]));
expect(dropdownItems.at(4).text()).toContain('Test Title'); expect(dropdownItems.at(4).text()).toContain('Test Title');
expect(dropdownItems.at(5).text()).toContain('Oct 11, 2021 - Oct 15, 2021'); expect(dropdownItems.at(5).text()).toContain(getIterationPeriod(TEST_ITERATIONS[2]));
expect(dropdownItems.at(6).findComponent(GlDropdownDivider).exists()).toBe(true); expect(dropdownItems.at(6).findComponent(GlDropdownDivider).exists()).toBe(true);
expect(dropdownItems.at(7).findComponent(GlDropdownSectionHeader).text()).toBe( expect(dropdownItems.at(7).findComponent(GlDropdownSectionHeader).text()).toBe(
'My Second Cadence', 'My Second Cadence',
); );
expect(dropdownItems.at(8).text()).toContain('Oct 6, 2021 - Oct 10, 2021'); expect(dropdownItems.at(8).text()).toContain(getIterationPeriod(TEST_ITERATIONS[1]));
}); });
}); });
}); });
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