Merge branch 'id-extract-widget-into-different-request' into 'master'

Extract MR's widget into a separate request

Closes #62723

See merge request gitlab-org/gitlab-ce!29979

3 files changed, 64 insertions, 2 deletions

diff --git a/spec/controllers/projects/merge_requests/content_controller_spec.rb b/spec/controllers/projects/merge_requests/content_controller_spec.rb
new file mode 100644
index 00000000000..2879e06aee4
--- /dev/null
+++ b/spec/controllers/projects/merge_requests/content_controller_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Projects::MergeRequests::ContentController do
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+  let(:merge_request) { create(:merge_request, target_project: project, source_project: project) }
+
+  before do
+    sign_in(user)
+  end
+
+  def do_request
+    get :widget, params: {
+      namespace_id: project.namespace.to_param,
+      project_id: project,
+      id: merge_request.iid,
+      format: :json
+    }
+  end
+
+  describe 'GET widget' do
+    context 'user has access to the project' do
+      before do
+        expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
+
+        project.add_maintainer(user)
+      end
+
+      it 'renders widget MR entity as json' do
+        do_request
+
+        expect(response).to match_response_schema('entities/merge_request_widget')
+      end
+
+      it 'checks whether the MR can be merged' do
+        controller.instance_variable_set(:@merge_request, merge_request)
+
+        expect(merge_request).to receive(:check_mergeability)
+
+        do_request
+      end
+
+      it 'closes an MR with moved source project' do
+        merge_request.update_column(:source_project_id, nil)
+
+        expect { do_request }.to change { merge_request.reload.open? }.from(true).to(false)
+      end
+    end
+
+    context 'user does not have access to the project' do
+      it 'renders widget MR entity as json' do
+        do_request
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json
index 7018cb9a305..eac1dbc6474 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -99,7 +99,8 @@
     "revert_in_fork_path": { "type": ["string", "null"] },
     "email_patches_path": { "type": "string" },
     "plain_diff_path": { "type": "string" },
-    "status_path": { "type": "string" },
+    "merge_request_basic_path": { "type": "string" },
+    "merge_request_widget_path": { "type": "string" },
     "new_blob_path": { "type": ["string", "null"] },
     "merge_check_path": { "type": "string" },
     "ci_environments_status_path": { "type": "string" },
diff --git a/spec/javascripts/vue_mr_widget/mock_data.js b/spec/javascripts/vue_mr_widget/mock_data.js
index 48f812f0db4..253413ae43e 100644
--- a/spec/javascripts/vue_mr_widget/mock_data.js
+++ b/spec/javascripts/vue_mr_widget/mock_data.js
@@ -218,7 +218,8 @@ export default {
     '/root/acets-app/forks?continue%5Bnotice%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+has+been+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.+Try+to+cherry-pick+this+commit+again.&continue%5Bnotice_now%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+is+being+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.&continue%5Bto%5D=%2Froot%2Facets-app%2Fmerge_requests%2F22&namespace_key=1',
   email_patches_path: '/root/acets-app/merge_requests/22.patch',
   plain_diff_path: '/root/acets-app/merge_requests/22.diff',
-  status_path: '/root/acets-app/merge_requests/22.json',
+  merge_request_basic_path: '/root/acets-app/merge_requests/22.json?serializer=basic',
+  merge_request_widget_path: '/root/acets-app/merge_requests/22/widget.json',
   merge_check_path: '/root/acets-app/merge_requests/22/merge_check',
   ci_environments_status_url: '/root/acets-app/merge_requests/22/ci_environments_status',
   project_archived: false,