kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ee-6516-extract-ee-specific-files-lines-for-spec-models-project_services' into 'master' 

Tweak kubernetes_service_spec for EE compatibility

Closes gitlab-ee#6516

See merge request gitlab-org/gitlab-ce!26155
This commit is contained in:
Robert Speicher 2019-03-20 11:16:38 +00:00
parent 65bbfd5a1a dd6736600a
commit e61cbe7fe3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spec/models/project_services/kubernetes_service_spec.rb
View File

@ -360,14 +360,16 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
context 'when kubernetes responds with valid pods' do
before do
stub_kubeclient_pods
stub_kubeclient_deployments # Used by EE
end
it { is_expected.to eq(pods: [kube_pod]) }
it { is_expected.to include(pods: [kube_pod]) }
end
context 'when kubernetes responds with 500s' do
before do
stub_kubeclient_pods(status: 500)
stub_kubeclient_deployments(status: 500) # Used by EE
end
it { expect { subject }.to raise_error(Kubeclient::HttpError) }
@ -376,9 +378,10 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
context 'when kubernetes responds with 404s' do
before do
stub_kubeclient_pods(status: 404)
stub_kubeclient_deployments(status: 404) # Used by EE
end
it { is_expected.to eq(pods: []) }
it { is_expected.to include(pods: []) }
end
end