diff options
| -rw-r--r-- | spec/javascripts/fixtures/merge_requests.rb | 16 | ||||
| -rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 13 |
2 files changed, 17 insertions, 12 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) diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 36bc5cf02c2..d119fc0c11e 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -1,7 +1,6 @@ /* eslint-disable no-var, comma-dangle, object-shorthand */ /* global Notes */ -<<<<<<< HEAD require('~/merge_request_tabs'); require('~/commit/pipelines/pipelines_bundle.js'); require('~/breakpoints'); @@ -9,18 +8,8 @@ require('~/lib/utils/common_utils'); require('~/diff'); require('~/single_file_diff'); require('~/files_comment_button'); +require('~/notes'); require('vendor/jquery.scrollTo'); -======= -import '~/merge_request_tabs'; -import '~/commit/pipelines/pipelines_bundle'; -import '~/breakpoints'; -import '~/lib/utils/common_utils'; -import '~/diff'; -import '~/single_file_diff'; -import '~/files_comment_button'; -import '~/notes'; -import 'vendor/jquery.scrollTo'; ->>>>>>> a59165e... Merge branch '32888-fix-error-after-missing-note-hash-fragment-in-dom' into 'master' (function () { // TODO: remove this hack! |