diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-03-20 11:16:38 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-03-20 11:16:38 +0000 |
commit | e61cbe7fe3abaee70216f33c7b9adaca598ff97f (patch) | |
tree | 469aa0279105a580dbb4cef755740c553a8c29ca | |
parent | 65bbfd5a1ae139d41ed2e235518d8475beaed18e (diff) | |
parent | dd6736600abdab50eaed51a08c57e0f3e89d2d3e (diff) | |
download | gitlab-ce-e61cbe7fe3abaee70216f33c7b9adaca598ff97f.tar.gz |
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
-rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 7 |
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 |