From 3744bcc0d10d24104e39985b6833a0ec51791c0a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 9 Oct 2019 09:06:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/bare_repository_import/importer_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/lib/gitlab/bare_repository_import') diff --git a/spec/lib/gitlab/bare_repository_import/importer_spec.rb b/spec/lib/gitlab/bare_repository_import/importer_spec.rb index 0c1eedad7f4..2fb9f1a0a08 100644 --- a/spec/lib/gitlab/bare_repository_import/importer_spec.rb +++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb @@ -89,7 +89,7 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do repo_path = "#{project.disk_path}.git" hook_path = File.join(repo_path, 'hooks') - expect(gitlab_shell.exists?(project.repository_storage, repo_path)).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, repo_path)).to be(true) expect(gitlab_shell.exists?(project.repository_storage, hook_path)).to be(true) end @@ -145,8 +145,8 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do project = Project.find_by_full_path("#{admin.full_path}/#{project_path}") - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.git')).to be(true) - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) end context 'with a repository already on disk' do @@ -186,7 +186,7 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do project = Project.find_by_full_path(project_path) - expect(gitlab_shell.exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) + expect(gitlab_shell.repository_exists?(project.repository_storage, project.disk_path + '.wiki.git')).to be(true) end end -- cgit v1.2.3