diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-09 12:06:19 +0300 |
commit | 3744bcc0d10d24104e39985b6833a0ec51791c0a (patch) | |
tree | ecad3a8435a74bd618acd591762906429f88bfd4 /spec/lib | |
parent | 78adf0c5cc2534908e3f16a9b8abf06509444cf3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/bare_repository_import/importer_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/shell_spec.rb | 24 |
2 files changed, 28 insertions, 4 deletions
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 diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb index 55d8bac6c03..ff9e31ec346 100644 --- a/spec/lib/gitlab/shell_spec.rb +++ b/spec/lib/gitlab/shell_spec.rb @@ -422,6 +422,30 @@ describe Gitlab::Shell do end end + describe '#repository_exists?' do + context 'when the storage path does not exist' do + subject { described_class.new.repository_exists?(storage, "non-existing.git") } + + it { is_expected.to be_falsey } + end + + context 'when the repository does not exist' do + let(:project) { create(:project, :repository, :legacy_storage) } + + subject { described_class.new.repository_exists?(storage, "#{project.repository.disk_path}-some-other-repo.git") } + + it { is_expected.to be_falsey } + end + + context 'when the repository exists' do + let(:project) { create(:project, :repository, :legacy_storage) } + + subject { described_class.new.repository_exists?(storage, "#{project.repository.disk_path}.git") } + + it { is_expected.to be_truthy } + end + end + describe '#remove' do it 'removes the namespace' do subject.add_namespace(storage, "mepmep") |