Merge pull request #3697 from oliverguenther/fix/repository_renaming
Correctly relocate repositories locally and remote after project identifier changespull/3706/head
commit
b034e660e5
@ -0,0 +1,60 @@ |
||||
#-- encoding: UTF-8 |
||||
#-- copyright |
||||
# OpenProject is a project management system. |
||||
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF) |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See doc/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
## |
||||
# Provides an asynchronous job to relocate a managed repository on the local or remote system |
||||
class Scm::RelocateRepositoryJob < Scm::RemoteRepositoryJob |
||||
def perform |
||||
if repository.class.manages_remote? |
||||
relocate_remote |
||||
else |
||||
relocate_on_disk |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
## |
||||
# POST to the remote managed repository a request to relocate the repository |
||||
def relocate_remote |
||||
send(repository_request.merge( |
||||
action: :relocate, |
||||
old_repository: repository.root_url)) |
||||
end |
||||
|
||||
## |
||||
# Tries to relocate the repository on disk. |
||||
# As we're performing this in a job and currently have no explicit means |
||||
# of error handling in this context, there's not much to do here in case of failure. |
||||
def relocate_on_disk |
||||
FileUtils.mv repository.root_url, repository.managed_repository_path |
||||
repository.update_columns(root_url: repository.managed_repository_path, |
||||
url: repository.managed_repository_url) |
||||
end |
||||
end |
@ -0,0 +1,72 @@ |
||||
shared_examples_for 'repository can be relocated' do |vendor| |
||||
let(:job) { ::Scm::RelocateRepositoryJob.new repository } |
||||
let(:project) { FactoryGirl.build :project } |
||||
let(:repository) { |
||||
repo = FactoryGirl.build("repository_#{vendor}".to_sym, |
||||
project: project, |
||||
scm_type: :managed) |
||||
|
||||
repo.configure(:managed, nil) |
||||
repo.save! |
||||
|
||||
repo |
||||
} |
||||
|
||||
before do |
||||
allow(::Scm::RelocateRepositoryJob).to receive(:new).and_return(job) |
||||
allow(Repository).to receive(:find).and_return(repository) |
||||
end |
||||
|
||||
context 'with managed local config' do |
||||
include_context 'with tmpdir' |
||||
let(:config) { { manages: File.join(tmpdir, 'myrepos') } } |
||||
|
||||
it 'relocates when project identifier is updated' do |
||||
current_path = repository.root_url |
||||
expect(repository.root_url).to eq(repository.managed_repository_path) |
||||
expect(Dir.exists?(repository.managed_repository_path)).to be true |
||||
|
||||
# Rename the project |
||||
project.update_attributes!(identifier: 'somenewidentifier') |
||||
repository.reload |
||||
|
||||
job.perform |
||||
|
||||
# Confirm that all paths are updated |
||||
expect(current_path).not_to eq(repository.managed_repository_path) |
||||
expect(current_path).not_to eq(repository.root_url) |
||||
expect(repository.url).to eq(repository.managed_repository_url) |
||||
|
||||
expect(Dir.exists?(repository.managed_repository_path)).to be true |
||||
end |
||||
end |
||||
|
||||
context 'with managed remote config', webmock: true do |
||||
let(:url) { 'http://myreposerver.example.com/api/' } |
||||
let(:config) { { manages: url } } |
||||
|
||||
let(:repository) { |
||||
stub_request(:post, url).to_return(status: 200) |
||||
FactoryGirl.create("repository_#{vendor}".to_sym, |
||||
project: project, |
||||
scm_type: :managed) |
||||
} |
||||
|
||||
before do |
||||
stub_request(:post, url).to_return(status: 200) |
||||
end |
||||
|
||||
it 'sends a relocation request when project identifier is updated' do |
||||
current_path = repository.root_url |
||||
|
||||
# Rename the project |
||||
project.identifier = 'somenewidentifier' |
||||
job.perform |
||||
|
||||
expect(WebMock) |
||||
.to have_requested(:post, url) |
||||
.with(body: hash_including(old_repository: current_path, |
||||
action: 'relocate')) |
||||
end |
||||
end |
||||
end |
Loading…
Reference in new issue