diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
commit | 27a18afc7dba4e09a5ec78e5c251c31216d7792a (patch) | |
tree | 5dcc015be79e00de4133a66defe10bf1463ff827 /spec/models/clusters | |
parent | 71c9d577ad563572050335dc261ba7673e3e566f (diff) | |
download | gitlab-ce-27a18afc7dba4e09a5ec78e5c251c31216d7792a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/clusters')
-rw-r--r-- | spec/models/clusters/platforms/kubernetes_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 4271cf9f1b3..f0e6dd53664 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -361,8 +361,10 @@ describe Clusters::Platforms::Kubernetes do describe '#calculate_reactive_cache_for' do let(:service) { create(:cluster_platform_kubernetes, :configured) } - let(:pod) { kube_pod } - let(:namespace) { pod["metadata"]["namespace"] } + let(:expected_pod_cached_data) do + kube_pod.tap { |kp| kp['metadata'].delete('namespace') } + end + let(:namespace) { "project-namespace" } let(:environment) { instance_double(Environment, deployment_namespace: namespace) } subject { service.calculate_reactive_cache_for(environment) } @@ -381,7 +383,7 @@ describe Clusters::Platforms::Kubernetes do stub_kubeclient_deployments(namespace) end - it { is_expected.to include(pods: [pod]) } + it { is_expected.to include(pods: [expected_pod_cached_data]) } end context 'when kubernetes responds with 500s' do |