Commit bba77591 authored by David O'Regan's avatar David O'Regan Committed by Phil Hughes

Move todo_mark_done mutation to graphql_shared dir

todo_mark_done is a generic mutation that can potentially
(and will) be shared across many applications in gitlab. An example is
Design Management.
parent 8725f589
<script> <script>
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import Todo from '~/sidebar/components/todo_toggle/todo.vue'; import Todo from '~/sidebar/components/todo_toggle/todo.vue';
import createAlertTodo from '../../graphql/mutations/alert_todo_create.mutation.graphql'; import createAlertTodoMutation from '../../graphql/mutations/alert_todo_create.mutation.graphql';
import todoMarkDone from '../../graphql/mutations/alert_todo_mark_done.mutation.graphql'; import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql';
import alertQuery from '../../graphql/queries/details.query.graphql'; import alertQuery from '../../graphql/queries/details.query.graphql';
export default { export default {
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
this.isUpdating = true; this.isUpdating = true;
return this.$apollo return this.$apollo
.mutate({ .mutate({
mutation: createAlertTodo, mutation: createAlertTodoMutation,
variables: { variables: {
iid: this.alert.iid, iid: this.alert.iid,
projectPath: this.projectPath, projectPath: this.projectPath,
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
this.isUpdating = true; this.isUpdating = true;
return this.$apollo return this.$apollo
.mutate({ .mutate({
mutation: todoMarkDone, mutation: todoMarkDoneMutation,
variables: { variables: {
id: this.firstToDoId, id: this.firstToDoId,
}, },
......
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import SidebarTodo from '~/alert_management/components/sidebar/sidebar_todo.vue'; import SidebarTodo from '~/alert_management/components/sidebar/sidebar_todo.vue';
import AlertMarkTodo from '~/alert_management/graphql/mutations/alert_todo_create.mutation.graphql'; import createAlertTodoMutation from '~/alert_management/graphql/mutations/alert_todo_create.mutation.graphql';
import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql';
import mockAlerts from '../mocks/alerts.json'; import mockAlerts from '../mocks/alerts.json';
const mockAlert = mockAlerts[0]; const mockAlert = mockAlerts[0];
...@@ -61,14 +62,14 @@ describe('Alert Details Sidebar To Do', () => { ...@@ -61,14 +62,14 @@ describe('Alert Details Sidebar To Do', () => {
expect(findToDoButton().text()).toBe('Add a To-Do'); expect(findToDoButton().text()).toBe('Add a To-Do');
}); });
it('calls `$apollo.mutate` with `AlertMarkTodo` mutation and variables containing `iid`, `todoEvent`, & `projectPath`', async () => { it('calls `$apollo.mutate` with `createAlertTodoMutation` mutation and variables containing `iid`, `todoEvent`, & `projectPath`', async () => {
jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult); jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
findToDoButton().trigger('click'); findToDoButton().trigger('click');
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({ expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
mutation: AlertMarkTodo, mutation: createAlertTodoMutation,
variables: { variables: {
iid: '1527542', iid: '1527542',
projectPath: 'projectPath', projectPath: 'projectPath',
...@@ -76,6 +77,7 @@ describe('Alert Details Sidebar To Do', () => { ...@@ -76,6 +77,7 @@ describe('Alert Details Sidebar To Do', () => {
}); });
}); });
}); });
describe('removing a todo', () => { describe('removing a todo', () => {
beforeEach(() => { beforeEach(() => {
mountComponent({ mountComponent({
...@@ -91,12 +93,19 @@ describe('Alert Details Sidebar To Do', () => { ...@@ -91,12 +93,19 @@ describe('Alert Details Sidebar To Do', () => {
expect(findToDoButton().text()).toBe('Mark as done'); expect(findToDoButton().text()).toBe('Mark as done');
}); });
it('calls `$apollo.mutate` with `AlertMarkTodoDone` mutation and variables containing `id`', async () => { it('calls `$apollo.mutate` with `todoMarkDoneMutation` mutation and variables containing `id`', async () => {
jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult); jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
findToDoButton().trigger('click'); findToDoButton().trigger('click');
await wrapper.vm.$nextTick(); await wrapper.vm.$nextTick();
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledTimes(1);
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
mutation: todoMarkDoneMutation,
update: expect.anything(),
variables: {
id: '1234',
},
});
}); });
}); });
}); });
......
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