Merge branch 'ide-merge-requests-forks' into 'master'

Allow merge requests from forks to be opened in Web IDE

Closes #47460

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

2 files changed, 34 insertions, 5 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
index 61b7bd2c226..8ac2f26979b 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
@@ -119,6 +119,7 @@ describe('MRWidgetHeader', () => {
       beforeEach(() => {
         vm = mountComponent(Component, {
           mr: {
+            iid: 1,
             divergedCommitsCount: 12,
             sourceBranch: 'mr-widget-refactor',
             sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">mr-widget-refactor</a>',
@@ -130,6 +131,8 @@ describe('MRWidgetHeader', () => {
             emailPatchesPath: '/mr/email-patches',
             plainDiffPath: '/mr/plainDiffPath',
             statusPath: 'abc',
+            sourceProjectFullPath: 'root/gitlab-ce',
+            targetProjectFullPath: 'gitlab-org/gitlab-ce',
           },
         });
       });
@@ -146,16 +149,40 @@ describe('MRWidgetHeader', () => {
         const button = vm.$el.querySelector('.js-web-ide');
 
         expect(button.textContent.trim()).toEqual('Open in Web IDE');
-        expect(button.getAttribute('href')).toEqual('/-/ide/projectabc');
+        expect(button.getAttribute('href')).toEqual(
+          '/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org%2Fgitlab-ce',
+        );
       });
 
-      it('renders web ide button with relative URL', () => {
+      it('renders web ide button with blank query string if target & source project branch', done => {
+        vm.mr.targetProjectFullPath = 'root/gitlab-ce';
+
+        vm.$nextTick(() => {
+          const button = vm.$el.querySelector('.js-web-ide');
+
+          expect(button.textContent.trim()).toEqual('Open in Web IDE');
+          expect(button.getAttribute('href')).toEqual(
+            '/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=',
+          );
+
+          done();
+        });
+      });
+
+      it('renders web ide button with relative URL', done => {
         gon.relative_url_root = '/gitlab';
+        vm.mr.iid = 2;
 
-        const button = vm.$el.querySelector('.js-web-ide');
+        vm.$nextTick(() => {
+          const button = vm.$el.querySelector('.js-web-ide');
 
-        expect(button.textContent.trim()).toEqual('Open in Web IDE');
-        expect(button.getAttribute('href')).toEqual('/-/ide/projectabc');
+          expect(button.textContent.trim()).toEqual('Open in Web IDE');
+          expect(button.getAttribute('href')).toEqual(
+            '/gitlab/-/ide/project/root/gitlab-ce/merge_requests/2?target_project=gitlab-org%2Fgitlab-ce',
+          );
+
+          done();
+        });
       });
 
       it('renders download dropdown with links', () => {
diff --git a/spec/javascripts/vue_mr_widget/mock_data.js b/spec/javascripts/vue_mr_widget/mock_data.js
index 9d2a15ff009..c0b5a7d4455 100644
--- a/spec/javascripts/vue_mr_widget/mock_data.js
+++ b/spec/javascripts/vue_mr_widget/mock_data.js
@@ -29,8 +29,10 @@ export default {
   source_branch: 'daaaa',
   source_branch_link: 'daaaa',
   source_project_id: 19,
+  source_project_full_path: '/group1/project1',
   target_branch: 'master',
   target_project_id: 19,
+  target_project_full_path: '/group2/project2',
   metrics: {
     merged_by: {
       name: 'Administrator',