Backport EE change for setting up forked projectbackport-ee-change-for-test

1 files changed, 1 insertions, 5 deletions

diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
index 9c9b0c4c4a1..a1f7dc44d31 100644
--- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb
+++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
@@ -6,11 +6,7 @@ describe MergeRequests::Conflicts::ResolveService do
   let(:project) { create(:project, :public, :repository) }
 
   let(:forked_project) do
-    forked_project = fork_project(project, user)
-    TestEnv.copy_repo(forked_project,
-                      bare_repo: TestEnv.forked_repo_path_bare,
-                      refs: TestEnv::FORKED_BRANCH_SHA)
-    forked_project
+    fork_project_with_submodules(project, user)
   end
 
   let(:merge_request) do