diff options
author | Stan Hu <stanhu@gmail.com> | 2018-07-26 18:44:21 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-07-26 18:44:21 +0000 |
commit | caeb4597a5b24e0eaa96b24901ce9208c2eef4bf (patch) | |
tree | 293c4fd1a71a44797eeb2662fec4743b8ebaa7b5 /spec | |
parent | 20e63ba1567dc18878e48e59df95ff9c7729d071 (diff) | |
parent | 9e396d6e1c975aece20877623973dcd2d6941355 (diff) | |
download | gitlab-ce-caeb4597a5b24e0eaa96b24901ce9208c2eef4bf.tar.gz |
Merge branch 'mk/fix-callback-canceling-in-namespace-move-dir' into 'master'
Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions
Closes gitlab-ee#6252
See merge request gitlab-org/gitlab-ce!19297
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/namespace_spec.rb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index c1b385aaf76..8ff16cbd7cc 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -205,6 +205,34 @@ describe Namespace do expect(gitlab_shell.exists?(project.repository_storage, "#{namespace.path}/#{project.path}.git")).to be_truthy end + context 'when #write_projects_repository_config raises an error' do + context 'in test environment' do + it 'raises an exception' do + expect(namespace).to receive(:write_projects_repository_config).and_raise('foo') + + expect do + namespace.update(path: namespace.full_path + '_new') + end.to raise_error('foo') + end + end + + context 'in production environment' do + it 'does not cancel later callbacks' do + expect(namespace).to receive(:write_projects_repository_config).and_raise('foo') + expect(namespace).to receive(:move_dir).and_wrap_original do |m, *args| + move_dir_result = m.call(*args) + + expect(move_dir_result).to be_truthy # Must be truthy, or else later callbacks would be canceled + + move_dir_result + end + expect(Gitlab::Sentry).to receive(:should_raise?).and_return(false) # like prod + + namespace.update(path: namespace.full_path + '_new') + end + end + end + context 'with subgroups', :nested_groups do let(:parent) { create(:group, name: 'parent', path: 'parent') } let(:new_parent) { create(:group, name: 'new_parent', path: 'new_parent') } |