generate mock data for diffdiscussions

2 files changed, 32 insertions, 8 deletions

diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index 95c03d8ae08..3bf5202c582 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -26,6 +26,20 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
       diff_refs: merge_request.diff_refs
     )
   end
+  let(:image_merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project, author: admin) }
+  let(:image_path)          { "files/images/ee_repo_logo.png" }
+  let(:image_position) do
+    Gitlab::Diff::Position.new(
+      old_path: path,
+      new_path: path,
+      width: 100,
+      height: 100,
+      x: 1,
+      y: 1,
+      position_type: "image",
+      diff_refs: image_merge_request.diff_refs
+    )
+  end
 
   render_views
 
@@ -72,17 +86,32 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
 
   it 'merge_requests/discussions.json' do |example|
     create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
+    render_discussions_json(merge_request, example.description)
+  end
+
+  it 'merge_requests/diff_discussion.json' do |example|
+    create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
+    render_discussions_json(merge_request, example.description)
+  end
+
+  it 'merge_requests/image_diff_discussion.json' do |example|
+    create(:diff_note_on_merge_request, project: project, noteable: image_merge_request, position: image_position)
+
+    render_discussions_json(merge_request, example.description)
+  end
+
+  private
+
+  def render_discussions_json(merge_request, fixture_file_name)
     get :discussions,
       namespace_id: project.namespace.to_param,
       project_id: project,
       id: merge_request.to_param,
       format: :json
 
-    store_frontend_fixture(response, example.description)
+    store_frontend_fixture(response, fixture_file_name)
   end
 
-  private
-
   def render_merge_request(fixture_file_name, merge_request)
     get :show,
       namespace_id: project.namespace.to_param,
diff --git a/spec/javascripts/notes/mock_data.js b/spec/javascripts/notes/mock_data.js
index cb306731604..ca2d14e24fd 100644
--- a/spec/javascripts/notes/mock_data.js
+++ b/spec/javascripts/notes/mock_data.js
@@ -270,11 +270,6 @@ export const discussionMock = {
   }],
   individual_note: false,
 };
-
-export const systemNoteMock = {
-
-};
-
 export const replacedImageDiffHtml = `
 <div class="image js-replaced-image" data="">
 <div class="two-up view">