Fix TestEnv.copy_repo to use disk_path instead of full_path
This commit is contained in:
parent
603fcb6b9c
commit
9d575acc5b
|
@ -203,7 +203,7 @@ describe Namespace do
|
|||
context 'with subgroups' do
|
||||
let(:parent) { create(:group, name: 'parent', path: 'parent') }
|
||||
let(:child) { create(:group, name: 'child', path: 'child', parent: parent) }
|
||||
let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child) }
|
||||
let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child, skip_disk_validation: true) }
|
||||
let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir) }
|
||||
let(:pages_dir) { File.join(TestEnv.pages_path) }
|
||||
|
||||
|
|
|
@ -2676,7 +2676,7 @@ describe Project do
|
|||
end
|
||||
|
||||
context 'hashed storage' do
|
||||
let(:project) { create(:project, :repository) }
|
||||
let(:project) { create(:project, :repository, skip_disk_validation: true) }
|
||||
let(:gitlab_shell) { Gitlab::Shell.new }
|
||||
let(:hash) { '6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b' }
|
||||
|
||||
|
|
|
@ -215,7 +215,7 @@ module TestEnv
|
|||
end
|
||||
|
||||
def copy_repo(project, bare_repo:, refs:)
|
||||
target_repo_path = File.expand_path(project.repository_storage_path + "/#{project.full_path}.git")
|
||||
target_repo_path = File.expand_path(project.repository_storage_path + "/#{project.disk_path}.git")
|
||||
FileUtils.mkdir_p(target_repo_path)
|
||||
FileUtils.cp_r("#{File.expand_path(bare_repo)}/.", target_repo_path)
|
||||
FileUtils.chmod_R 0755, target_repo_path
|
||||
|
|
Loading…
Reference in New Issue