Merge branch 'winh-notes-service-applySuggestion' into 'master'
Remove applySuggestion from notes service See merge request gitlab-org/gitlab-ce!30399
This commit is contained in:
commit
6e9f882007
|
@ -1,5 +1,4 @@
|
|||
import Vue from 'vue';
|
||||
import Api from '~/api';
|
||||
import VueResource from 'vue-resource';
|
||||
import * as constants from '../constants';
|
||||
|
||||
|
@ -45,7 +44,4 @@ export default {
|
|||
toggleIssueState(endpoint, data) {
|
||||
return Vue.http.put(endpoint, data);
|
||||
},
|
||||
applySuggestion(id) {
|
||||
return Api.applySuggestion(id);
|
||||
},
|
||||
};
|
||||
|
|
|
@ -14,6 +14,7 @@ import sidebarTimeTrackingEventHub from '../../sidebar/event_hub';
|
|||
import { isInViewport, scrollToElement, isInMRPage } from '../../lib/utils/common_utils';
|
||||
import mrWidgetEventHub from '../../vue_merge_request_widget/event_hub';
|
||||
import { __ } from '~/locale';
|
||||
import Api from '~/api';
|
||||
|
||||
let eTagPoll;
|
||||
|
||||
|
@ -449,8 +450,7 @@ export const submitSuggestion = (
|
|||
{ commit, dispatch },
|
||||
{ discussionId, noteId, suggestionId, flashContainer },
|
||||
) =>
|
||||
service
|
||||
.applySuggestion(suggestionId)
|
||||
Api.applySuggestion(suggestionId)
|
||||
.then(() => commit(types.APPLY_SUGGESTION, { discussionId, noteId, suggestionId }))
|
||||
.then(() => dispatch('resolveDiscussion', { discussionId }).catch(() => {}))
|
||||
.catch(err => {
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove applySuggestion from notes service
|
||||
merge_request: 30399
|
||||
author: Frank van Rest
|
||||
type: other
|
|
@ -1,6 +1,7 @@
|
|||
import Vue from 'vue';
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import Api from '~/api';
|
||||
import { TEST_HOST } from 'spec/test_constants';
|
||||
import { headersInterceptor } from 'spec/helpers/vue_resource_helper';
|
||||
import actionsModule, * as actions from '~/notes/stores/actions';
|
||||
|
@ -8,7 +9,6 @@ import * as mutationTypes from '~/notes/stores/mutation_types';
|
|||
import * as notesConstants from '~/notes/constants';
|
||||
import createStore from '~/notes/stores';
|
||||
import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub';
|
||||
import service from '~/notes/services/notes_service';
|
||||
import testAction from '../../helpers/vuex_action_helper';
|
||||
import { resetStore } from '../helpers';
|
||||
import {
|
||||
|
@ -846,9 +846,9 @@ describe('Actions Notes Store', () => {
|
|||
let flashContainer;
|
||||
|
||||
beforeEach(() => {
|
||||
spyOn(service, 'applySuggestion');
|
||||
spyOn(Api, 'applySuggestion');
|
||||
dispatch.and.returnValue(Promise.resolve());
|
||||
service.applySuggestion.and.returnValue(Promise.resolve());
|
||||
Api.applySuggestion.and.returnValue(Promise.resolve());
|
||||
flashContainer = {};
|
||||
});
|
||||
|
||||
|
@ -877,7 +877,7 @@ describe('Actions Notes Store', () => {
|
|||
it('when service fails, flashes error message', done => {
|
||||
const response = { response: { data: { message: TEST_ERROR_MESSAGE } } };
|
||||
|
||||
service.applySuggestion.and.returnValue(Promise.reject(response));
|
||||
Api.applySuggestion.and.returnValue(Promise.reject(response));
|
||||
|
||||
testSubmitSuggestion(done, () => {
|
||||
expect(commit).not.toHaveBeenCalled();
|
||||
|
|
Loading…
Reference in New Issue