diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-02 11:20:25 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-02 11:20:25 +0000 |
commit | 4f4c11340a13ee2b925ad6547d953955e9bf7645 (patch) | |
tree | 1b064ecb2a8f5976284fc9359bdd8dd71b09d5f5 /spec | |
parent | 974fe0797079f4f7ddc57b45d15ee7d39a06e78a (diff) | |
parent | bba99da98cd0b3d8fbcee7b02fb3d0ad7d642a24 (diff) | |
download | gitlab-ce-4f4c11340a13ee2b925ad6547d953955e9bf7645.tar.gz |
Merge branch 'sh-improve-container-tags-update-username' into 'master'
Improve logging when username update fails due to registry tags
See merge request gitlab-org/gitlab-ce!22038
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/namespace_spec.rb | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index 3649990670b..22dc81acfda 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -82,6 +82,27 @@ describe Namespace do it { expect(namespace.human_name).to eq(namespace.owner_name) } end + describe '#first_project_with_container_registry_tags' do + let(:container_repository) { create(:container_repository) } + let!(:project) { create(:project, namespace: namespace, container_repositories: [container_repository]) } + + before do + stub_container_registry_config(enabled: true) + end + + it 'returns the project' do + stub_container_registry_tags(repository: :any, tags: ['tag']) + + expect(namespace.first_project_with_container_registry_tags).to eq(project) + end + + it 'returns no project' do + stub_container_registry_tags(repository: :any, tags: nil) + + expect(namespace.first_project_with_container_registry_tags).to be_nil + end + end + describe '.search' do let(:namespace) { create(:namespace) } @@ -184,7 +205,8 @@ describe Namespace do end it 'raises an error about not movable project' do - expect { namespace.move_dir }.to raise_error(/Namespace cannot be moved/) + expect { namespace.move_dir }.to raise_error(Gitlab::UpdatePathError, + /Namespace .* cannot be moved/) end end end |