diff options
| -rw-r--r-- | app/assets/javascripts/notes.js | 6 | ||||
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 3 | ||||
| -rw-r--r-- | spec/javascripts/notes_spec.js | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index c46be163b82..13ca455bdb8 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -52,7 +52,7 @@ // We are in the Merge Requests page so we need another edit form for Changes tab if (gl.utils.getPagePath(1) === 'merge_requests') { $('.note-edit-form').clone() - .addClass('mr-discussion-edit-form').insertAfter('.note-edit-form'); + .addClass('mr-note-edit-form').insertAfter('.note-edit-form'); } } @@ -565,10 +565,10 @@ }; Notes.prototype.getEditFormSelector = function($el) { - var selector = '.note-edit-form:not(.mr-discussion-edit-form)'; + var selector = '.note-edit-form:not(.mr-note-edit-form)'; if ($el.parents('#diffs').length) { - selector = '.note-edit-form.mr-discussion-edit-form'; + selector = '.note-edit-form.mr-note-edit-form'; } return selector; diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 7c62e510392..d93f1ef8f81 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -71,7 +71,8 @@ describe 'Comments', feature: true do describe 'when editing a note', js: true do it 'there should be a hidden edit form' do - is_expected.to have_css('.note-edit-form', visible: false, count: 1) + is_expected.to have_css('.note-edit-form:not(.mr-note-edit-form)', visible: false, count: 1) + is_expected.to have_css('.note-edit-form.mr-note-edit-form', visible: false, count: 1) end describe 'editing the note' do diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 2db182d702b..229f030058f 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -17,6 +17,7 @@ fixture.load(commentsTemplate); gl.utils.disableButtonIfEmptyField = _.noop; window.project_uploads_path = 'http://test.host/uploads'; + $('body').data('page', 'projects:issues:show'); }); describe('task lists', function() { |