Skip to content

G
gitlab-ce
Commit 0c1cf679 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

[ci skip] Adds tests for issue app

parent 23334ac0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 195 deletions
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @ 0c1cf679
...@@ -175,7 +175,6 @@ ...@@ -175,7 +175,6 @@
this.noteType = type; this.noteType = type;
}, },
editCurrentUserLastNote() { editCurrentUserLastNote() {
console.log('editCurrentUserLastNote')
if (this.note === '') { if (this.note === '') {
const lastNote = this.getCurrentUserLastNote(window.gon.current_user_id); const lastNote = this.getCurrentUserLastNote(window.gon.current_user_id);
...@@ -254,7 +253,7 @@ ...@@ -254,7 +253,7 @@
:disabled="isSubmitButtonDisabled" :disabled="isSubmitButtonDisabled"
name="button" name="button"
type="button" type="button"
class="btn btn-nr comment-btn note-type-toggle js-note-new-discussion dropdown-toggle" class="btn comment-btn note-type-toggle js-note-new-discussion dropdown-toggle"
data-toggle="dropdown" data-toggle="dropdown"
aria-label="Open comment type dropdown"> aria-label="Open comment type dropdown">
<i <i
...@@ -305,7 +304,7 @@ ...@@ -305,7 +304,7 @@
type="submit" type="submit"
v-if="canUpdateIssue" v-if="canUpdateIssue"
:class="actionButtonClassNames" :class="actionButtonClassNames"
class="btn btn-nr btn-comment btn-comment-and-close"> class="btn btn-comment btn-comment-and-close">
{{issueActionButtonTitle}} {{issueActionButtonTitle}}
</button> </button>
<button <button
......
app/assets/javascripts/notes/components/issue_note_form.vue
View file @ 0c1cf679
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
return this.getNotesDataByProp('markdownDocs'); return this.getNotesDataByProp('markdownDocs');
}, },
quickActionsDocsUrl() { quickActionsDocsUrl() {
return this.getNotesDataByProp('quickActionsDocs'); return !this.isEditing ? this.getNotesDataByProp('quickActionsDocs') : undefined;
}, },
currentUserId() { currentUserId() {
return this.getUserDataByProp('id'); return this.getUserDataByProp('id');
...@@ -134,15 +134,15 @@ ...@@ -134,15 +134,15 @@
ref="textarea" ref="textarea"
slot="textarea" slot="textarea"
placeholder="Write a comment or drag your files here..." placeholder="Write a comment or drag your files here..."
@keydown.meta.enter="handleUpdate" @keydown.meta.enter="handleUpdate()"
@keydown.up="editMyLastNote" @keydown.up="editMyLastNote()"
@keydown.esc="cancelHandler(true)"> @keydown.esc="cancelHandler(true)">
</textarea> </textarea>
</markdown-field> </markdown-field>
<div class="note-form-actions clearfix"> <div class="note-form-actions clearfix">
<button <button
type="submit" type="submit"
@click="handleUpdate" @click="handleUpdate()"
:disabled="isDisabled" :disabled="isDisabled"
class="js-vue-issue-save btn btn-save"> class="js-vue-issue-save btn btn-save">
{{saveButtonTitle}} {{saveButtonTitle}}
......
app/assets/javascripts/notes/components/issue_notes_app.vue
View file @ 0c1cf679
...@@ -97,11 +97,11 @@ ...@@ -97,11 +97,11 @@
}, },
checkLocationHash() { checkLocationHash() {
const hash = gl.utils.getLocationHash(); const hash = gl.utils.getLocationHash();
const $el = $(`#${hash}`); const element = document.getElementById(hash);
if (hash && $el) { if (hash && element) {
this.setTargetNoteHash(hash); this.setTargetNoteHash(hash);
this.scrollToNoteIfNeeded($el); this.scrollToNoteIfNeeded($(element));
} }
}, },
}, },
......
spec/javascripts/notes/mock_data.js
View file @ 0c1cf679
/* eslint disable */ /* eslint-disable */
export const notesDataMock = { export const notesDataMock = {
discussionsPath: '/gitlab-org/gitlab-ce/issues/26/discussions.json', discussionsPath: '/gitlab-org/gitlab-ce/issues/26/discussions.json',
lastFetchedAt: '1501862675', lastFetchedAt: '1501862675',
...@@ -222,96 +221,138 @@ export const discussionMock = { ...@@ -222,96 +221,138 @@ export const discussionMock = {
individual_note: false, individual_note: false,
}; };
export const discussionResponse = [{ export const individualNoteServerResponse = [{
"id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", "id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"reply_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", "reply_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"expanded": true, "expanded": true,
"notes": [{ "notes": [{
"id": 1390, "id": 1390,
"attachment": { "attachment": {
"url": null, "url": null,
"filename": null, "filename": null,
"image": false "image": false
}, },
"author": { "author": {
"id": 1, "id": 1,
"name": "Root", "name": "Root",
"username": "root", "username": "root",
"state": "active", "state": "active",
"avatar_url": null, "avatar_url": null,
"path": "/root" "path": "/root"
}, },
"created_at": "2017-08-01T17:09:33.762Z", "created_at": "2017-08-01T17:09:33.762Z",
"updated_at": "2017-08-01T17:09:33.762Z", "updated_at": "2017-08-01T17:09:33.762Z",
"system": false, "system": false,
"noteable_id": 98, "noteable_id": 98,
"noteable_type": "Issue", "noteable_type": "Issue",
"type": null, "type": null,
"human_access": "Owner", "human_access": "Owner",
"note": "sdfdsaf", "note": "sdfdsaf",
"note_html": "\u003cp dir=\"auto\"\u003esdfdsaf\u003c/p\u003e", "note_html": "\u003cp dir=\"auto\"\u003esdfdsaf\u003c/p\u003e",
"current_user": { "current_user": {
"can_edit": true "can_edit": true
}, },
"discussion_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd", "discussion_id": "0fb4e0e3f9276e55ff32eb4195add694aece4edd",
"emoji_awardable": true, "emoji_awardable": true,
"award_emoji": [{ "award_emoji": [{
"name": "baseball", "name": "baseball",
"user": { "user": {
"id": 1, "id": 1,
"name": "Root", "name": "Root",
"username": "root" "username": "root"
} }
}, { }, {
"name": "art", "name": "art",
"user": { "user": {
"id": 1, "id": 1,
"name": "Root", "name": "Root",
"username": "root" "username": "root"
} }
}], }],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1390/toggle_award_emoji", "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", "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" "path": "/gitlab-org/gitlab-ce/notes/1390"
}], }],
"individual_note": true "individual_note": true
}, { }, {
"id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", "id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"reply_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", "reply_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"expanded": true, "expanded": true,
"notes": [{ "notes": [{
"id": 1391, "id": 1391,
"attachment": { "attachment": {
"url": null, "url": null,
"filename": null, "filename": null,
"image": false "image": false
}, },
"author": { "author": {
"id": 1, "id": 1,
"name": "Root", "name": "Root",
"username": "root", "username": "root",
"state": "active", "state": "active",
"avatar_url": null, "avatar_url": null,
"path": "/root" "path": "/root"
}, },
"created_at": "2017-08-02T10:51:38.685Z", "created_at": "2017-08-02T10:51:38.685Z",
"updated_at": "2017-08-02T10:51:38.685Z", "updated_at": "2017-08-02T10:51:38.685Z",
"system": false, "system": false,
"noteable_id": 98, "noteable_id": 98,
"noteable_type": "Issue", "noteable_type": "Issue",
"type": null, "type": null,
"human_access": "Owner", "human_access": "Owner",
"note": "New note!", "note": "New note!",
"note_html": "\u003cp dir=\"auto\"\u003eNew note!\u003c/p\u003e", "note_html": "\u003cp dir=\"auto\"\u003eNew note!\u003c/p\u003e",
"current_user": { "current_user": {
"can_edit": true "can_edit": true
}, },
"discussion_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790", "discussion_id": "70d5c92a4039a36c70100c6691c18c27e4b0a790",
"emoji_awardable": true, "emoji_awardable": true,
"award_emoji": [], "award_emoji": [],
"toggle_award_path": "/gitlab-org/gitlab-ce/notes/1391/toggle_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", "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" "path": "/gitlab-org/gitlab-ce/notes/1391"
}], }],
"individual_note": true "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
}];
\ No newline at end of file
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