Skip to content

G
gitlab-ce
Commit 05e61c36 authored by Eric Eastwood's avatar Eric Eastwood
Browse files
Options

Use shared interceptor in note specs

parent 9469979a
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 205 deletions
spec/javascripts/notes/components/issue_note_app_spec.js
View file @ 05e61c36
...@@ -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) => {
......
spec/javascripts/notes/mock_data.js
View file @ 05e61c36
...@@ -312,186 +312,212 @@ export const loggedOutnoteableData = { ...@@ -312,186 +312,212 @@ export const loggedOutnoteableData = {
"preview_note_path": "/gitlab-org/gitlab-ce/preview_markdown?quick_actions_target_id=98&quick_actions_target_type=Issue" "preview_note_path": "/gitlab-org/gitlab-ce/preview_markdown?quick_actions_target_id=98&quick_actions_target_type=Issue"
} }
export const individualNoteServerResponse = [{ export const INDIVIDUAL_NOTE_RESPONSE_MAP = {
"id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", 'GET': {
"reply_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", '/gitlab-org/gitlab-ce/issues/26/discussions.json': [{
"expanded": true, "id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"notes": [{ "reply_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"id": 1390, "expanded": true,
"attachment": { "notes": [{
"url": null, "id": 1390,
"filename": null, "attachment": {
"image": false "url": null,
}, "filename": null,
"author": { "image": false
"id": 1, },
"name": "Root", "author": {
"username": "root", "id": 1,
"state": "active", "name": "Root",
"avatar_url": null, "username": "root",
"path": "/root" "state": "active",
}, "avatar_url": null,
"created_at": "2017-08-01T17:09:33.762Z", "path": "/root"
"updated_at": "2017-08-01T17:09:33.762Z", },
"system": false, "created_at": "2017-08-01T17:09:33.762Z",
"noteable_id": 98, "updated_at": "2017-08-01T17:09:33.762Z",
"noteable_type": "Issue", "system": false,
"type": null, "noteable_id": 98,
"human_access": "Owner", "noteable_type": "Issue",
"note": "sdfdsaf", "type": null,
"note_html": "\u003cp dir=\"auto\"\u003esdfdsaf\u003c/p\u003e", "human_access": "Owner",
"current_user": { "note": "sdfdsaf",
"can_edit": true "note_html": "\u003cp dir=\"auto\"\u003esdfdsaf\u003c/p\u003e",
"current_user": {
"can_edit": true
},
"discussion_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"emoji_awardable": true,
"award_emoji": [{
"name": "baseball",
"user": {
"id": 1,
"name": "Root",
"username": "root"
}
}, {
"name": "art",
"user": {
"id": 1,
"name": "Root",
"username": "root"
}
}],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1390/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1390\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1390"
}],
"individual_note": true
}, {
"id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"reply_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"expanded": true,
"notes": [{
"id": 1391,
"attachment": {
"url": null,
"filename": null,
"image": false
},
"author": {
"id": 1,
"name": "Root",
"username": "root",
"state": "active",
"avatar_url": null,
"path": "/root"
},
"created_at": "2017-08-02T10:51:38.685Z",
"updated_at": "2017-08-02T10:51:38.685Z",
"system": false,
"noteable_id": 98,
"noteable_type": "Issue",
"type": null,
"human_access": "Owner",
"note": "New note!",
"note_html": "\u003cp dir=\"auto\"\u003eNew note!\u003c/p\u003e",
"current_user": {
"can_edit": true
},
"discussion_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"emoji_awardable": true,
"award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1391/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1391\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1391"
}],
"individual_note": true
}],
'/gitlab-org/gitlab-ce/noteable/issue/98/notes': {
last_fetched_at: 1512900838,
notes: [],
}, },
"discussion_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", },
"emoji_awardable": true, 'PUT': {
"award_emoji": [{ '/gitlab-org/gitlab-ce/notes/1471': {
"name": "baseball", "commands_changes": null,
"user": { "valid": true,
"id": 1471,
"attachment": null,
"author": {
"id": 1, "id": 1,
"name": "Root", "name": "Root",
"username": "root" "username": "root",
} "state": "active",
}, { "avatar_url": null,
"name": "art", "path": "/root"
"user": { },
"created_at": "2017-08-08T16:53:00.666Z",
"updated_at": "2017-12-10T11:03:21.876Z",
"system": false,
"noteable_id": 124,
"noteable_type": "Issue",
"noteable_iid": 29,
"type": "DiscussionNote",
"human_access": "Owner",
"note": "Adding a comment",
"note_html": "\u003cp dir=\"auto\"\u003eAdding a comment\u003c/p\u003e",
"last_edited_at": "2017-12-10T11:03:21.876Z",
"last_edited_by": {
"id": 1, "id": 1,
"name": "Root", "name": 'Root',
"username": "root" "username": 'root',
} "state": 'active',
}], "avatar_url": null,
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1390/toggle_award_emoji", "path": '/root',
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1390\u0026user_id=1", },
"path": "/gitlab-org/gitlab-ce/notes/1390" "current_user": {
}], "can_edit": true
"individual_note": true },
}, { "discussion_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", "emoji_awardable": true,
"reply_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", "award_emoji": [],
"expanded": true, "toggle_award_path": "/gitlab-org/gitlab-ce/notes/1471/toggle_award_emoji",
"notes": [{ "report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F29%23note_1471\u0026user_id=1",
"id": 1391, "path": "/gitlab-org/gitlab-ce/notes/1471"
"attachment": {
"url": null,
"filename": null,
"image": false
},
"author": {
"id": 1,
"name": "Root",
"username": "root",
"state": "active",
"avatar_url": null,
"path": "/root"
},
"created_at": "2017-08-02T10:51:38.685Z",
"updated_at": "2017-08-02T10:51:38.685Z",
"system": false,
"noteable_id": 98,
"noteable_type": "Issue",
"type": null,
"human_access": "Owner",
"note": "New note!",
"note_html": "\u003cp dir=\"auto\"\u003eNew note!\u003c/p\u003e",
"current_user": {
"can_edit": true
}, },
"discussion_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", }
"emoji_awardable": true,
"award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1391/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F26%23note_1391\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1391"
}],
"individual_note": true
}];
export const discussionNoteServerResponse = [{
"id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"reply_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"expanded": true,
"notes": [{
"id": 1471,
"attachment": {
"url": null,
"filename": null,
"image": false
},
"author": {
"id": 1,
"name": "Root",
"username": "root",
"state": "active",
"avatar_url": null,
"path": "/root"
},
"created_at": "2017-08-08T16:53:00.666Z",
"updated_at": "2017-08-08T16:53:00.666Z",
"system": false,
"noteable_id": 124,
"noteable_type": "Issue",
"noteable_iid": 29,
"type": "DiscussionNote",
"human_access": "Owner",
"note": "Adding a comment",
"note_html": "\u003cp dir=\"auto\"\u003eAdding a comment\u003c/p\u003e",
"current_user": {
"can_edit": true
},
"discussion_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"emoji_awardable": true,
"award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1471/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F29%23note_1471\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1471"
}],
"individual_note": false
}];
export const notesPollingResponse = {
last_fetched_at: 1512900838,
notes: [],
}; };
export const updatedNoteResponse = { export const DISCUSSION_NOTE_RESPONSE_MAP = {
"commands_changes": null, ...INDIVIDUAL_NOTE_RESPONSE_MAP,
"valid": true, 'GET': {
"id": 1471, ...INDIVIDUAL_NOTE_RESPONSE_MAP.GET,
"attachment": null, '/gitlab-org/gitlab-ce/issues/26/discussions.json': [{
"author": { "id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"id": 1, "reply_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"name": "Root", "expanded": true,
"username": "root", "notes": [{
"state": "active", "id": 1471,
"avatar_url": null, "attachment": {
"path": "/root" "url": null,
}, "filename": null,
"created_at": "2017-08-08T16:53:00.666Z", "image": false
"updated_at": "2017-12-10T11:03:21.876Z", },
"system": false, "author": {
"noteable_id": 124, "id": 1,
"noteable_type": "Issue", "name": "Root",
"noteable_iid": 29, "username": "root",
"type": "DiscussionNote", "state": "active",
"human_access": "Owner", "avatar_url": null,
"note": "Adding a comment", "path": "/root"
"note_html": "\u003cp dir=\"auto\"\u003eAdding a comment\u003c/p\u003e", },
"last_edited_at": "2017-12-10T11:03:21.876Z", "created_at": "2017-08-08T16:53:00.666Z",
"last_edited_by": { "updated_at": "2017-08-08T16:53:00.666Z",
"id": 1, "system": false,
"name": 'Root', "noteable_id": 124,
"username": 'root', "noteable_type": "Issue",
"state": 'active', "noteable_iid": 29,
"avatar_url": null, "type": "DiscussionNote",
"path": '/root', "human_access": "Owner",
}, "note": "Adding a comment",
"current_user": { "note_html": "\u003cp dir=\"auto\"\u003eAdding a comment\u003c/p\u003e",
"can_edit": true "current_user": {
"can_edit": true
},
"discussion_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"emoji_awardable": true,
"award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1471/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F29%23note_1471\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1471"
}],
"individual_note": false
}],
}, },
"discussion_id": "a3ed36e29b1957efb3b68c53e2d7a2b24b1df052",
"emoji_awardable": true,
"award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1471/toggle_award_emoji",
"report_abuse_path": "/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F29%23note_1471\u0026user_id=1",
"path": "/gitlab-org/gitlab-ce/notes/1471"
}; };
export function individualNoteInterceptor(request, next) {
const body = INDIVIDUAL_NOTE_RESPONSE_MAP[request.method.toUpperCase()][request.url];
next(request.respondWith(JSON.stringify(body), {
status: 200,
}));
}
export function discussionNoteInterceptor(request, next) {
const body = DISCUSSION_NOTE_RESPONSE_MAP[request.method.toUpperCase()][request.url];
next(request.respondWith(JSON.stringify(body), {
status: 200,
}));
}
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7