Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 17 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
diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
index 004e8a28c12..5b402e572c3 100644
--- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb
+++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
@@ -440,18 +440,4 @@ describe ErrorTracking::ProjectErrorTrackingSetting do
       end
     end
   end
-
-  describe '#expire_issues_cache', :use_clean_rails_memory_store_caching do
-    it 'clears the cache' do
-      klass_key = subject.class.reactive_cache_key.call(subject).join(':')
-      key = "#{klass_key}:list_issues:some_suffix"
-      Rails.cache.write(key, 1)
-
-      expect(Rails.cache.exist?(key)).to eq(true)
-
-      subject.expire_issues_cache
-
-      expect(Rails.cache.exist?(key)).to eq(false)
-    end
-  end
 end