summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-27 20:42:57 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-27 20:43:04 +0100
commit2f130527c0959df1a79d8a4bec648b8f3ead73ca (patch)
treee1779443f8ad6a1510486863d23f2f685036ef5f
parentb5079721bfff6fd36d79da9c6ab22bfd9009f752 (diff)
downloadgitlab-ce-2f130527c0959df1a79d8a4bec648b8f3ead73ca.tar.gz
FE review changes - remove internal details assertion and look for closest form if no discussion_line_code
-rw-r--r--app/assets/javascripts/notes.js2
-rw-r--r--spec/javascripts/notes_spec.js4
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 7f163e7e0e8..b111c117556 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -415,7 +415,7 @@ export default class Notes {
this.note_ids.push(noteEntity.id);
form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`);
- row = form.length ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`);
+ row = (form.length || !noteEntity.discussion_line_code) ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`);
if (noteEntity.on_image) {
row = form;
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index 8514c7ac5a1..d7aa7a3d9e6 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -380,13 +380,9 @@ import '~/notes';
document.body.appendChild(line);
$form.closest.and.returnValues($form);
- spyOn(document, 'getElementById').and.callThrough();
- spyOn($.fn, 'after').and.callThrough();
Notes.prototype.renderDiscussionNote.call(notes, note, $form);
- expect(document.getElementById).toHaveBeenCalledWith(note.discussion_line_code);
- expect($.fn.after).toHaveBeenCalled();
expect(line.nextSibling.outerHTML).toEqual(note.diff_discussion_html);
});
});