Commit 05e61c36 authored by Eric Eastwood's avatar Eric Eastwood

Use shared interceptor in note specs

parent 9469979a
...@@ -8,28 +8,6 @@ describe('issue_note_app', () => { ...@@ -8,28 +8,6 @@ describe('issue_note_app', () => {
let mountComponent; let mountComponent;
let vm; let vm;
const individualNoteInterceptor = (request, next) => {
next(request.respondWith(JSON.stringify(mockData.individualNoteServerResponse), {
status: 200,
}));
};
const noteInterceptor = (request, next) => {
if (request.url === '/gitlab-org/gitlab-ce/issues/26/discussions.json') {
next(request.respondWith(JSON.stringify(mockData.discussionNoteServerResponse), {
status: 200,
}));
} else if (request.url === '/gitlab-org/gitlab-ce/noteable/issue/98/notes') {
next(request.respondWith(JSON.stringify(mockData.notesPollingResponse), {
status: 200,
}));
} else if (request.method === 'PUT' && request.url === '/gitlab-org/gitlab-ce/notes/1471') {
next(request.respondWith(JSON.stringify(mockData.updatedNoteResponse), {
status: 200,
}));
}
};
beforeEach(() => { beforeEach(() => {
const IssueNotesApp = Vue.extend(issueNotesApp); const IssueNotesApp = Vue.extend(issueNotesApp);
...@@ -85,16 +63,16 @@ describe('issue_note_app', () => { ...@@ -85,16 +63,16 @@ describe('issue_note_app', () => {
describe('render', () => { describe('render', () => {
beforeEach(() => { beforeEach(() => {
Vue.http.interceptors.push(individualNoteInterceptor); Vue.http.interceptors.push(mockData.individualNoteInterceptor);
vm = mountComponent(); vm = mountComponent();
}); });
afterEach(() => { afterEach(() => {
Vue.http.interceptors = _.without(Vue.http.interceptors, individualNoteInterceptor); Vue.http.interceptors = _.without(Vue.http.interceptors, mockData.individualNoteInterceptor);
}); });
it('should render list of notes', (done) => { it('should render list of notes', (done) => {
const note = mockData.individualNoteServerResponse[0].notes[0]; const note = mockData.INDIVIDUAL_NOTE_RESPONSE_MAP.GET['/gitlab-org/gitlab-ce/issues/26/discussions.json'][0].notes[0];
setTimeout(() => { setTimeout(() => {
expect( expect(
...@@ -140,13 +118,16 @@ describe('issue_note_app', () => { ...@@ -140,13 +118,16 @@ describe('issue_note_app', () => {
describe('update note', () => { describe('update note', () => {
describe('individual note', () => { describe('individual note', () => {
beforeEach(() => { beforeEach(() => {
Vue.http.interceptors.push(noteInterceptor); Vue.http.interceptors.push(mockData.individualNoteInterceptor);
spyOn(service, 'updateNote').and.callThrough(); spyOn(service, 'updateNote').and.callThrough();
vm = mountComponent(); vm = mountComponent();
}); });
afterEach(() => { afterEach(() => {
Vue.http.interceptors = _.without(Vue.http.interceptors, noteInterceptor); Vue.http.interceptors = _.without(
Vue.http.interceptors,
mockData.individualNoteInterceptor,
);
}); });
it('renders edit form', (done) => { it('renders edit form', (done) => {
...@@ -180,13 +161,16 @@ describe('issue_note_app', () => { ...@@ -180,13 +161,16 @@ describe('issue_note_app', () => {
describe('dicussion note', () => { describe('dicussion note', () => {
beforeEach(() => { beforeEach(() => {
Vue.http.interceptors.push(noteInterceptor); Vue.http.interceptors.push(mockData.discussionNoteInterceptor);
spyOn(service, 'updateNote').and.callThrough(); spyOn(service, 'updateNote').and.callThrough();
vm = mountComponent(); vm = mountComponent();
}); });
afterEach(() => { afterEach(() => {
Vue.http.interceptors = _.without(Vue.http.interceptors, noteInterceptor); Vue.http.interceptors = _.without(
Vue.http.interceptors,
mockData.discussionNoteInterceptor,
);
}); });
it('renders edit form', (done) => { it('renders edit form', (done) => {
...@@ -237,12 +221,12 @@ describe('issue_note_app', () => { ...@@ -237,12 +221,12 @@ describe('issue_note_app', () => {
describe('edit form', () => { describe('edit form', () => {
beforeEach(() => { beforeEach(() => {
Vue.http.interceptors.push(individualNoteInterceptor); Vue.http.interceptors.push(mockData.individualNoteInterceptor);
vm = mountComponent(); vm = mountComponent();
}); });
afterEach(() => { afterEach(() => {
Vue.http.interceptors = _.without(Vue.http.interceptors, individualNoteInterceptor); Vue.http.interceptors = _.without(Vue.http.interceptors, mockData.individualNoteInterceptor);
}); });
it('should render markdown docs url', (done) => { it('should render markdown docs url', (done) => {
......
This diff is collapsed.
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