From 1f4b61e9ad3c11cd6f72cb2006d5ffa38753ebfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Tue, 10 Oct 2017 16:01:13 +0200 Subject: [PATCH] Try to capitalize when determining container status in topology https://bugzilla.redhat.com/show_bug.cgi?id=1500401 --- app/services/container_topology_service.rb | 2 +- spec/services/container_topology_service_spec.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/services/container_topology_service.rb b/app/services/container_topology_service.rb index c2a88e0b3e0..4b72ec703ef 100644 --- a/app/services/container_topology_service.rb +++ b/app/services/container_topology_service.rb @@ -65,7 +65,7 @@ def entity_status(entity) elsif entity.kind_of?(ContainerGroup) status = entity.phase elsif entity.kind_of?(Container) - status = entity.state.capitalize + status = entity.state.try(:capitalize) elsif entity.kind_of?(ContainerReplicator) status = entity.current_replicas == entity.replicas ? 'OK' : 'Warning' elsif entity.kind_of?(ManageIQ::Providers::ContainerManager) diff --git a/spec/services/container_topology_service_spec.rb b/spec/services/container_topology_service_spec.rb index 297558a147f..1ca36e6e796 100644 --- a/spec/services/container_topology_service_spec.rb +++ b/spec/services/container_topology_service_spec.rb @@ -188,4 +188,18 @@ ) end end + + describe '#entity_status' do + context 'entity is a container' do + let(:entity) { FactoryGirl.create(:container) } + + context 'state is not defined' do + before { allow(entity).to receive(:state).and_return(nil) } + + it 'returns with nil' do + expect(container_topology_service.entity_status(entity)).to be_nil + end + end + end + end end