Commit 7db1f226 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Fix specs for services related to container registry

parent af42dd29
require 'spec_helper' require 'spec_helper'
describe ContainerImages::DestroyService, services: true do describe ContainerImages::DestroyService, '#execute', :services do
describe '#execute' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:container_repository) { create(:container_repository, name: '') }
let(:project) { create(:project, path: 'test', namespace: user.namespace, container_repositorys: [container_repository]) } let(:container_repository) do
let(:example_host) { 'example.com' } create(:container_repository, name: 'myimage', tags: %w[latest])
let(:registry_url) { 'http://' + example_host } end
let(:project) do
create(:project, path: 'test',
namespace: user.namespace,
container_repositories: [container_repository])
end
it { expect(container_repository).to be_valid } it { expect(container_repository).to be_valid }
it { expect(project.container_repositorys).not_to be_empty } it { expect(project.container_repositories).not_to be_empty }
context 'when container image has tags' do context 'when container image has tags' do
before do before do
project.team << [user, :master] project.add_master(user)
end end
it 'removes all tags before destroy' do it 'removes all tags before destroy' do
service = described_class.new(project, user) service = described_class.new(project, user)
expect(container_repository).to receive(:delete_tags).and_return(true) expect(container_repository)
expect { service.execute(container_repository) }.to change(project.container_repositorys, :count).by(-1) .to receive(:delete_tags).and_return(true)
expect { service.execute(container_repository) }
.to change(project.container_repositories, :count).by(-1)
end end
it 'fails when tags are not removed' do it 'fails when tags are not removed' do
service = described_class.new(project, user) service = described_class.new(project, user)
expect(container_repository).to receive(:delete_tags).and_return(false) expect(container_repository)
expect { service.execute(container_repository) }.to raise_error(ActiveRecord::RecordNotDestroyed) .to receive(:delete_tags).and_return(false)
end expect { service.execute(container_repository) }
.to raise_error(ActiveRecord::RecordNotDestroyed)
end end
end end
end end
...@@ -95,7 +95,7 @@ describe Projects::DestroyService, services: true do ...@@ -95,7 +95,7 @@ describe Projects::DestroyService, services: true do
before do before do
stub_container_registry_config(enabled: true) stub_container_registry_config(enabled: true)
stub_container_registry_tags('tag') stub_container_registry_tags('tag')
project.container_repositorys << container_repository project.container_repositories << container_repository
end end
context 'images deletion succeeds' do context 'images deletion succeeds' do
......
...@@ -34,7 +34,7 @@ describe Projects::TransferService, services: true do ...@@ -34,7 +34,7 @@ describe Projects::TransferService, services: true do
before do before do
stub_container_registry_config(enabled: true) stub_container_registry_config(enabled: true)
stub_container_registry_tags('tag') stub_container_registry_tags('tag')
project.container_repositorys << container_repository project.container_repositories << container_repository
end end
subject { transfer_project(project, user, group) } subject { transfer_project(project, user, group) }
......
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