Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
index 091a44130a1..df2023b7356 100644
--- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
@@ -213,6 +213,38 @@ RSpec.describe Projects::MergeRequests::CreationsController do
       expect(assigns(:commit)).to be_nil
       expect(response).to have_gitlab_http_status(:ok)
     end
+
+    context 'no target_project_id provided' do
+      before do
+        project.add_maintainer(user)
+      end
+
+      it 'selects itself as a target project' do
+        get :branch_to,
+          params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          ref: 'master'
+        }
+
+        expect(assigns(:target_project)).to eq(project)
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+
+      context 'project is a fork' do
+        it 'calls to project defaults to selects a correct target project' do
+          get :branch_to,
+            params: {
+            namespace_id: fork_project.namespace,
+            project_id: fork_project,
+            ref: 'master'
+          }
+
+          expect(assigns(:target_project)).to eq(project)
+          expect(response).to have_gitlab_http_status(:ok)
+        end
+      end
+    end
   end
 
   describe 'POST create' do