summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-16 22:40:23 -0800
committerStan Hu <stanhu@gmail.com>2019-02-05 21:33:09 -0800
commit6bac612dc4545abcbbfc86477417f711e02427ba (patch)
treea1dd2e6e3dc88715101e0ad0f2261c1dacd414be /spec
parent82b6e5378ab7c63b166229388f0a9b1bd79319c7 (diff)
downloadgitlab-ce-6bac612dc4545abcbbfc86477417f711e02427ba.tar.gz
Clean up Shell.fork_repository
Use project models instead of a list of parameters.
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/shell_spec.rb11
-rw-r--r--spec/workers/repository_fork_worker_spec.rb9
2 files changed, 4 insertions, 16 deletions
diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb
index 303dad94f2a..033e1bf81a1 100644
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
@@ -474,15 +474,10 @@ describe Gitlab::Shell do
end
describe '#fork_repository' do
+ let(:target_project) { create(:project) }
+
subject do
- gitlab_shell.fork_repository(
- project.repository_storage,
- project.disk_path,
- project.full_path,
- 'nfs-file05',
- 'fork/path',
- 'fork/path'
- )
+ gitlab_shell.fork_repository(project, target_project)
end
it 'returns true when the command succeeds' do
diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb
index 97210eba127..31bfe88d0bd 100644
--- a/spec/workers/repository_fork_worker_spec.rb
+++ b/spec/workers/repository_fork_worker_spec.rb
@@ -24,14 +24,7 @@ describe RepositoryForkWorker do
end
def expect_fork_repository
- expect(shell).to receive(:fork_repository).with(
- 'default',
- project.disk_path,
- project.full_path,
- forked_project.repository_storage,
- forked_project.disk_path,
- forked_project.full_path
- )
+ expect(shell).to receive(:fork_repository).with(project, forked_project)
end
describe 'when a worker was reset without cleanup' do