diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-27 12:58:41 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-27 12:58:41 +0300 |
commit | 6b02f502c84450d5e23866fef0d3da600d7c78ae (patch) | |
tree | 4ca55b589534d36471fb0cea96a50afca8603cea /spec | |
parent | 2b6bdbe671d5b650ce38b8f2a6cfd814c8d519d7 (diff) | |
parent | 6d4c2529f94e7d96a456cf14d8f5187087637f32 (diff) |
Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'master'
Handle nil terminals in Clusters::Platforms::Kubernetes
Closes #55551
See merge request gitlab-org/gitlab-ce!23925
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index f3af9d59786..e6b076adc76 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -325,12 +325,13 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching context 'with valid pods' do let(:pod) { kube_pod(app: environment.slug) } + let(:pod_with_no_terminal) { kube_pod(app: environment.slug, status: "Pending") } let(:terminals) { kube_terminals(service, pod) } before do stub_reactive_cache( service, - pods: [pod, pod, kube_pod(app: "should-be-filtered-out")] + pods: [pod, pod, pod_with_no_terminal, kube_pod(app: "should-be-filtered-out")] ) end |