summaryrefslogtreecommitdiff
path: root/spec/models/project_services
diff options
context:
space:
mode:
authorTiger <twatson@gitlab.com>2019-03-14 19:39:39 +1100
committerTiger <twatson@gitlab.com>2019-03-15 08:39:09 +1100
commitdd6736600abdab50eaed51a08c57e0f3e89d2d3e (patch)
tree6c1de524bacfd33d034117e61c80873bc2ff65a0 /spec/models/project_services
parentd3d24bb4a555a21c19cbfd1ed7c743387537d5b8 (diff)
downloadgitlab-ce-dd6736600abdab50eaed51a08c57e0f3e89d2d3e.tar.gz
Tweak kubernetes_service_spec for EE compatibility
Diffstat (limited to 'spec/models/project_services')
-rw-r--r--spec/models/project_services/kubernetes_service_spec.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 47f70e6648a..cb20c747972 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -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