Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-23 17:54:59 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-23 17:54:59 +0300
commitdcd2eeb1cfb633f4a28ddd9bc79deac0e3171d3f (patch)
treee0cc4860cdd544e666a12bd8b436419489c2d07a /spec/services
parent3e01fed5cb36962065f5d19ab6a0cef1dfc14b48 (diff)
Rename container image to repository in specs
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/container_images/destroy_service_spec.rb16
-rw-r--r--spec/services/projects/destroy_service_spec.rb4
-rw-r--r--spec/services/projects/transfer_service_spec.rb4
3 files changed, 12 insertions, 12 deletions
diff --git a/spec/services/container_images/destroy_service_spec.rb b/spec/services/container_images/destroy_service_spec.rb
index 5b4dbaa7934..ebc15598cce 100644
--- a/spec/services/container_images/destroy_service_spec.rb
+++ b/spec/services/container_images/destroy_service_spec.rb
@@ -3,13 +3,13 @@ require 'spec_helper'
describe ContainerImages::DestroyService, services: true do
describe '#execute' do
let(:user) { create(:user) }
- let(:container_image) { create(:container_image, name: '') }
- let(:project) { create(:project, path: 'test', namespace: user.namespace, container_images: [container_image]) }
+ let(:container_repository) { create(:container_repository, name: '') }
+ let(:project) { create(:project, path: 'test', namespace: user.namespace, container_repositorys: [container_repository]) }
let(:example_host) { 'example.com' }
let(:registry_url) { 'http://' + example_host }
- it { expect(container_image).to be_valid }
- it { expect(project.container_images).not_to be_empty }
+ it { expect(container_repository).to be_valid }
+ it { expect(project.container_repositorys).not_to be_empty }
context 'when container image has tags' do
before do
@@ -19,15 +19,15 @@ describe ContainerImages::DestroyService, services: true do
it 'removes all tags before destroy' do
service = described_class.new(project, user)
- expect(container_image).to receive(:delete_tags).and_return(true)
- expect { service.execute(container_image) }.to change(project.container_images, :count).by(-1)
+ expect(container_repository).to receive(:delete_tags).and_return(true)
+ expect { service.execute(container_repository) }.to change(project.container_repositorys, :count).by(-1)
end
it 'fails when tags are not removed' do
service = described_class.new(project, user)
- expect(container_image).to receive(:delete_tags).and_return(false)
- expect { service.execute(container_image) }.to raise_error(ActiveRecord::RecordNotDestroyed)
+ expect(container_repository).to receive(:delete_tags).and_return(false)
+ expect { service.execute(container_repository) }.to raise_error(ActiveRecord::RecordNotDestroyed)
end
end
end
diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb
index f91d62ebdaf..daad65d478a 100644
--- a/spec/services/projects/destroy_service_spec.rb
+++ b/spec/services/projects/destroy_service_spec.rb
@@ -90,12 +90,12 @@ describe Projects::DestroyService, services: true do
end
context 'container registry' do
- let(:container_image) { create(:container_image) }
+ let(:container_repository) { create(:container_repository) }
before do
stub_container_registry_config(enabled: true)
stub_container_registry_tags('tag')
- project.container_images << container_image
+ project.container_repositorys << container_repository
end
context 'images deletion succeeds' do
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 5e56226ff91..adf8ede5086 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -29,12 +29,12 @@ describe Projects::TransferService, services: true do
end
context 'disallow transfering of project with tags' do
- let(:container_image) { create(:container_image) }
+ let(:container_repository) { create(:container_repository) }
before do
stub_container_registry_config(enabled: true)
stub_container_registry_tags('tag')
- project.container_images << container_image
+ project.container_repositorys << container_repository
end
subject { transfer_project(project, user, group) }