diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-19 07:33:34 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-19 07:33:34 +0000 |
| commit | 6cfea81e6dc51e9627e2b2f64e29834e0e9bfc60 (patch) | |
| tree | f9a4e8632ab00f17e66b770039de485dcb1c811f /spec/models | |
| parent | 4773111e95dbddb9c41619d512cc457a4089f0ff (diff) | |
| parent | 83874edb77235d2a276f114f72942c43e8be3a44 (diff) | |
| download | gitlab-ce-6cfea81e6dc51e9627e2b2f64e29834e0e9bfc60.tar.gz | |
Merge branch 'update-kubeclient' into 'master'
Update kubeclient 2.2.0 -> 3.0
Closes #43911
See merge request gitlab-org/gitlab-ce!17739
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/project_services/kubernetes_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 53a4e545ff6..add481b8096 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -252,7 +252,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching stub_kubeclient_pods(status: 500) end - it { expect { subject }.to raise_error(KubeException) } + it { expect { subject }.to raise_error(Kubeclient::HttpError) } end context 'when kubernetes responds with 404s' do diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb index 622d8844a72..3be023a48c1 100644 --- a/spec/models/project_services/kubernetes_service_spec.rb +++ b/spec/models/project_services/kubernetes_service_spec.rb @@ -370,7 +370,7 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do stub_kubeclient_pods(status: 500) end - it { expect { subject }.to raise_error(KubeException) } + it { expect { subject }.to raise_error(Kubeclient::HttpError) } end context 'when kubernetes responds with 404s' do |