summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-23 13:37:47 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-23 14:37:32 +0100
commit1ae013dad5cca881e54e4c67f42748ed6580bfec (patch)
tree49c874fb0b2bc4f1ce70b8afc5286be6ce20247f
parent09e6b8b9615d888cbd8f585cfef05b18ca6639ec (diff)
downloadgitlab-ce-1ae013dad5cca881e54e4c67f42748ed6580bfec.tar.gz
Fix karma
-rw-r--r--app/assets/javascripts/notes.js2
-rw-r--r--spec/javascripts/notes_spec.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index cf247a4c170..7f163e7e0e8 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -413,8 +413,8 @@ export default class Notes {
return;
}
this.note_ids.push(noteEntity.id);
- form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`);
+ form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`);
row = form.length ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`);
if (noteEntity.on_image) {
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index 66c52611614..2514f7ea841 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -333,6 +333,7 @@ import '~/notes';
diff_discussion_html: false,
};
$form = jasmine.createSpyObj('$form', ['closest', 'find']);
+ $form.length = 1;
row = jasmine.createSpyObj('row', ['prevAll', 'first', 'find']);
notes = jasmine.createSpyObj('notes', [