diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-08 16:31:11 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-08 16:31:11 +0300 |
commit | ee01ebd9e4be07090cd5afb7ea69d4a301dbf642 (patch) | |
tree | 596d67f422f05d8cd988be85b8a9e263aa43392d /spec/javascripts/fixtures/merge_requests.rb | |
parent | 59c9ec5ce6ef5a59fe989a06f0b8fa94aaba31d7 (diff) |
Fixed UP arrow key not editing last comment in discussion
Closes #31348
Diffstat (limited to 'spec/javascripts/fixtures/merge_requests.rb')
-rw-r--r-- | spec/javascripts/fixtures/merge_requests.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb index 47d904b865b..a746a776548 100644 --- a/spec/javascripts/fixtures/merge_requests.rb +++ b/spec/javascripts/fixtures/merge_requests.rb @@ -16,6 +16,16 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont sha: merge_request.diff_head_sha ) end + let(:path) { "files/ruby/popen.rb" } + let(:position) do + Gitlab::Diff::Position.new( + old_path: path, + new_path: path, + old_line: nil, + new_line: 14, + diff_refs: merge_request.diff_refs + ) + end render_views @@ -39,6 +49,12 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont render_merge_request(example.description, merged_merge_request) end + it 'merge_requests/diff_comment.html.raw' do |example| + create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request) + create(:note_on_merge_request, author: admin, project: project, noteable: merge_request) + render_merge_request(example.description, merge_request) + end + private def render_merge_request(fixture_file_name, merge_request) |