Commit e8cced80 authored by Stan Hu's avatar Stan Hu 🔴

Fix failing importer test case on MySQL due to missing trailing slash in root path

parent 78f7c3c8
Pipeline #14904055 passed with stages
in 92 minutes and 55 seconds
......@@ -34,8 +34,11 @@ module Gitlab
private
def repo_relative_path
absolute_path = Pathname.new(repo_path)
project_root = Pathname.new(@root_path)
# Remove root path and `.git` at the end
repo_path[@root_path.size...-4]
absolute_path.relative_path_from(project_root).to_s.gsub(/\.git$/, '')
end
end
end
......
......@@ -134,8 +134,12 @@ describe Gitlab::BareRepositoryImport::Importer, repository: true do
end
it 'moves an existing project to the correct path' do
# This is a quick way to get a valid repository instead of copying an existing one
project = create(:project, :repository)
original_commit_count = project.repository.commit_count
# We need to destroy the model but keep the repository so that the
# importer will attempt to load the repository
project.destroy
bare_repo = Gitlab::BareRepositoryImport::Repository.new(project.repository_storage_path, project.repository.path)
gitlab_importer = described_class.new(admin, bare_repo)
......
......@@ -46,6 +46,13 @@ describe ::Gitlab::BareRepositoryImport::Repository do
describe '#project_full_path' do
it 'returns the project full path' do
expect(project_repo_path.repo_path).to eq('/full/path/to/repo.git')
expect(project_repo_path.project_full_path).to eq('to/repo')
end
it 'with no trailing slash in the root path' do
repo_path = described_class.new('/full/path', '/full/path/to/repo.git')
expect(repo_path.project_full_path).to eq('to/repo')
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment