From 70b05a83772abc59b3c914c84bc4d2c07749884d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 13 Jun 2017 17:12:31 -0500
Subject: Split up MergeRequestsController

---
 spec/javascripts/fixtures/merge_requests.rb       | 19 ++------
 spec/javascripts/fixtures/merge_requests_diffs.rb | 57 +++++++++++++++++++++++
 2 files changed, 60 insertions(+), 16 deletions(-)
 create mode 100644 spec/javascripts/fixtures/merge_requests_diffs.rb

(limited to 'spec/javascripts/fixtures')

diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index daaddd8f390..7e2f364ffa4 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -55,27 +55,14 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
     render_merge_request(example.description, merge_request)
   end
 
-  it 'merge_requests/inline_changes_tab_with_comments.json' 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, action: :diffs, format: :json)
-  end
-
-  it 'merge_requests/parallel_changes_tab_with_comments.json' 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, action: :diffs, format: :json, view: 'parallel')
-  end
-
   private
 
-  def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html, view: 'inline')
-    get action,
+  def render_merge_request(fixture_file_name, merge_request)
+    get :show,
       namespace_id: project.namespace.to_param,
       project_id: project,
       id: merge_request.to_param,
-      format: format,
-      view: view
+      format: :html
 
     expect(response).to be_success
     store_frontend_fixture(response, fixture_file_name)
diff --git a/spec/javascripts/fixtures/merge_requests_diffs.rb b/spec/javascripts/fixtures/merge_requests_diffs.rb
new file mode 100644
index 00000000000..ac5b06ace6d
--- /dev/null
+++ b/spec/javascripts/fixtures/merge_requests_diffs.rb
@@ -0,0 +1,57 @@
+
+require 'spec_helper'
+
+describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin) }
+  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let(:project) { create(:project, namespace: namespace, path: 'merge-requests-project') }
+  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
+  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
+
+  before(:all) do
+    clean_frontend_fixtures('merge_request_diffs/')
+  end
+
+  before(:each) do
+    sign_in(admin)
+  end
+
+  it 'merge_request_diffs/inline_changes_tab_with_comments.json' 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
+
+  it 'merge_request_diffs/parallel_changes_tab_with_comments.json' 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, view: 'parallel')
+  end
+
+  private
+
+  def render_merge_request(fixture_file_name, merge_request, view: 'inline')
+    get :show,
+      namespace_id: project.namespace.to_param,
+      project_id: project,
+      id: merge_request.to_param,
+      format: :json,
+      view: view
+
+    expect(response).to be_success
+    store_frontend_fixture(response, fixture_file_name)
+  end
+end
-- 
cgit v1.2.1