Commit 6a57a63a authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ss/rename-assign-dropdown' into 'master'

Rename assignees_dropdown to multiselect_dropdown

See merge request gitlab-org/gitlab!47116
parents 43ad159c e3b165a3
......@@ -4,7 +4,7 @@ import { GlDropdownItem, GlDropdownDivider, GlAvatarLabeled, GlAvatarLink } from
import { __, n__ } from '~/locale';
import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue';
import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
import AssigneesDropdown from '~/vue_shared/components/sidebar/assignees_dropdown.vue';
import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';
import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql';
export default {
......@@ -17,7 +17,7 @@ export default {
components: {
BoardEditableItem,
IssuableAssignees,
AssigneesDropdown,
MultiSelectDropdown,
GlDropdownItem,
GlDropdownDivider,
GlAvatarLabeled,
......@@ -92,7 +92,7 @@ export default {
</template>
<template #default>
<assignees-dropdown
<multi-select-dropdown
class="w-100"
:text="$options.i18n.assignees"
:header-text="$options.i18n.assignTo"
......@@ -138,7 +138,7 @@ export default {
</gl-avatar-link>
</gl-dropdown-item>
</template>
</assignees-dropdown>
</multi-select-dropdown>
</template>
</board-editable-item>
</template>
......@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
import { GlDropdownItem, GlAvatarLink, GlAvatarLabeled } from '@gitlab/ui';
import BoardAssigneeDropdown from '~/boards/components/board_assignee_dropdown.vue';
import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue';
import AssigneesDropdown from '~/vue_shared/components/sidebar/assignees_dropdown.vue';
import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';
import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
import store from '~/boards/stores';
import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql';
......@@ -109,7 +109,7 @@ describe('BoardCardAssigneeDropdown', () => {
createComponent();
expect(wrapper.find(IssuableAssignees).isVisible()).toBe(true);
expect(wrapper.find(AssigneesDropdown).isVisible()).toBe(false);
expect(wrapper.find(MultiSelectDropdown).isVisible()).toBe(false);
});
});
......@@ -122,7 +122,7 @@ describe('BoardCardAssigneeDropdown', () => {
it('shows assignees dropdown', async () => {
expect(wrapper.find(IssuableAssignees).isVisible()).toBe(false);
expect(wrapper.find(AssigneesDropdown).isVisible()).toBe(true);
expect(wrapper.find(MultiSelectDropdown).isVisible()).toBe(true);
});
it('shows the issue returned as the activeIssue', async () => {
......
import { shallowMount } from '@vue/test-utils';
import { getByText } from '@testing-library/dom';
import AssigneesDropdown from '~/vue_shared/components/sidebar/assignees_dropdown.vue';
import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';
describe('AssigneesDropdown Component', () => {
describe('MultiSelectDropdown Component', () => {
it('renders items slot', () => {
const wrapper = shallowMount(AssigneesDropdown, {
const wrapper = shallowMount(MultiSelectDropdown, {
propsData: {
text: '',
headerText: '',
......
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