Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-07-26 16:23:04 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2019-07-26 16:23:04 +0300
commit995d8e6c5e52afc294573e016f86f2a429b85d8e (patch)
tree28e8ce2609045a73cf54880da261c04d8c322ff5 /spec/models
parent6d830eaea38ba3b917ecad40e630afe2c0ec36c5 (diff)
parent41f87e9e99e14f7d591f222b0246467acd040625 (diff)
Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into 'master'
Remove fallback to deployment_platform_cluster in `DeploymentMetrics` See merge request gitlab-org/gitlab-ce!31126
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/deployment_metrics_spec.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/models/deployment_metrics_spec.rb b/spec/models/deployment_metrics_spec.rb
index 0aadb1f3a5e..7c574a8b6c8 100644
--- a/spec/models/deployment_metrics_spec.rb
+++ b/spec/models/deployment_metrics_spec.rb
@@ -49,18 +49,6 @@ describe DeploymentMetrics do
it { is_expected.to be_truthy }
end
-
- context 'fallback deployment platform' do
- let(:cluster) { create(:cluster, :provided_by_user, environment_scope: '*', projects: [deployment.project]) }
- let!(:prometheus) { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
-
- before do
- expect(deployment.project).to receive(:deployment_platform).and_return(cluster.platform)
- expect(cluster.application_prometheus).to receive(:can_query?).and_return(true)
- end
-
- it { is_expected.to be_truthy }
- end
end
end