Commit b23e42b0 authored by Clement Ho's avatar Clement Ho

Merge branch 'remove-vue-resource-from-issue' into 'master'

Remove vue resource from issue

See merge request gitlab-org/gitlab-ce!32421
parents 3d8d394c c487c7cf
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* global ListMilestone */ /* global ListMilestone */
/* global ListAssignee */ /* global ListAssignee */
import Vue from 'vue'; import axios from '~/lib/utils/axios_utils';
import './label'; import './label';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import IssueProject from './project'; import IssueProject from './project';
...@@ -133,7 +133,7 @@ class ListIssue { ...@@ -133,7 +133,7 @@ class ListIssue {
} }
const projectPath = this.project ? this.project.path : ''; const projectPath = this.project ? this.project.path : '';
return Vue.http.patch(`${this.path}.json`, data).then(({ body = {} } = {}) => { return axios.patch(`${this.path}.json`, data).then(({ data: body = {} } = {}) => {
/** /**
* Since post implementation of Scoped labels, server can reject * Since post implementation of Scoped labels, server can reject
* same key-ed labels. To keep the UI and server Model consistent, * same key-ed labels. To keep the UI and server Model consistent,
......
---
title: Remove vue resource from issue
merge_request: 32421
author: Lee Tickett
type: other
/* global ListIssue */ /* global ListIssue */
import Vue from 'vue'; import axios from '~/lib/utils/axios_utils';
import '~/boards/models/label'; import '~/boards/models/label';
import '~/boards/models/assignee'; import '~/boards/models/assignee';
import '~/boards/models/issue'; import '~/boards/models/issue';
...@@ -175,7 +175,7 @@ describe('Issue model', () => { ...@@ -175,7 +175,7 @@ describe('Issue model', () => {
describe('update', () => { describe('update', () => {
it('passes assignee ids when there are assignees', done => { it('passes assignee ids when there are assignees', done => {
spyOn(Vue.http, 'patch').and.callFake((url, data) => { spyOn(axios, 'patch').and.callFake((url, data) => {
expect(data.issue.assignee_ids).toEqual([1]); expect(data.issue.assignee_ids).toEqual([1]);
done(); done();
return Promise.resolve(); return Promise.resolve();
...@@ -185,7 +185,7 @@ describe('Issue model', () => { ...@@ -185,7 +185,7 @@ describe('Issue model', () => {
}); });
it('passes assignee ids of [0] when there are no assignees', done => { it('passes assignee ids of [0] when there are no assignees', done => {
spyOn(Vue.http, 'patch').and.callFake((url, data) => { spyOn(axios, 'patch').and.callFake((url, data) => {
expect(data.issue.assignee_ids).toEqual([0]); expect(data.issue.assignee_ids).toEqual([0]);
done(); done();
return Promise.resolve(); return Promise.resolve();
......
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