Merge branch 'zj-fork-mandatory' into 'master'

Move forking to Gitaly

Closes gitaly#817 and gitaly#1236

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

2 files changed, 9 insertions, 35 deletions

diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb
index 155e1663298..c435f988cdd 100644
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
@@ -498,34 +498,18 @@ describe Gitlab::Shell do
         )
       end
 
-      context 'with gitaly' do
-        it 'returns true when the command succeeds' do
-          expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
-            .with(repository.raw_repository) { :gitaly_response_object }
-
-          is_expected.to be_truthy
-        end
-
-        it 'return false when the command fails' do
-          expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
-            .with(repository.raw_repository) { raise GRPC::BadStatus, 'bla' }
+      it 'returns true when the command succeeds' do
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
+          .with(repository.raw_repository) { :gitaly_response_object }
 
-          is_expected.to be_falsy
-        end
+        is_expected.to be_truthy
       end
 
-      context 'without gitaly', :disable_gitaly do
-        it 'returns true when the command succeeds' do
-          expect(gitlab_projects).to receive(:fork_repository).with('nfs-file05', 'fork/path.git') { true }
-
-          is_expected.to be_truthy
-        end
-
-        it 'return false when the command fails' do
-          expect(gitlab_projects).to receive(:fork_repository).with('nfs-file05', 'fork/path.git') { false }
+      it 'return false when the command fails' do
+        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:fork_repository)
+          .with(repository.raw_repository) { raise GRPC::BadStatus, 'bla' }
 
-          is_expected.to be_falsy
-        end
+        is_expected.to be_falsy
       end
     end
 
@@ -665,7 +649,7 @@ describe Gitlab::Shell do
 
         subject do
           gitlab_shell.fetch_remote(repository.raw_repository, remote_name,
-            forced: true, no_tags: true, ssh_auth: ssh_auth)
+                                    forced: true, no_tags: true, ssh_auth: ssh_auth)
         end
 
         it 'passes the correct params to the gitaly service' do
diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb
index 5d83397e8df..ac8716ecfb1 100644
--- a/spec/workers/repository_fork_worker_spec.rb
+++ b/spec/workers/repository_fork_worker_spec.rb
@@ -92,16 +92,6 @@ describe RepositoryForkWorker do
       end
 
       it_behaves_like 'RepositoryForkWorker performing'
-
-      it 'logs a message about forking with old-style arguments' do
-        allow(subject).to receive(:gitlab_shell).and_return(shell)
-        expect(shell).to receive(:fork_repository) { true }
-
-        allow(Rails.logger).to receive(:info).with(anything) # To compensate for other logs
-        expect(Rails.logger).to receive(:info).with("Project #{fork_project.id} is being forked using old-style arguments.")
-
-        perform!
-      end
     end
   end
 end