diff options
author | Robert Speicher <robert@gitlab.com> | 2017-06-26 16:24:47 +0000 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 15:50:09 -0500 |
commit | c5da65b9e33e711b5ccaf55ceec52523a97dc89f (patch) | |
tree | 5a62bf7160a7f3340994cbee08d1eae23c8ca618 | |
parent | 10549d36f0de64b5b94fbe9fad238ed7da64a70e (diff) | |
download | gitlab-ce-c5da65b9e33e711b5ccaf55ceec52523a97dc89f.tar.gz |
Merge branch '33933-fix-deployment-indicator-date' into 'master'
Fix bug where Service `created_at` time was used instead of deployment time.
Closes #33933
See merge request !12395
-rw-r--r-- | app/models/project_services/prometheus_service.rb | 2 | ||||
-rw-r--r-- | spec/models/project_services/prometheus_service_spec.rb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 110b8bc209b..3e95cbe7a68 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -70,7 +70,7 @@ class PrometheusService < MonitoringService def deployment_metrics(deployment) metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &:itself) - metrics&.merge(deployment_time: created_at.to_i) || {} + metrics&.merge(deployment_time: deployment.created_at.to_i) || {} end # Cache metrics for specific environment diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb index 1f9d3c07b51..d341296336d 100644 --- a/spec/models/project_services/prometheus_service_spec.rb +++ b/spec/models/project_services/prometheus_service_spec.rb @@ -67,7 +67,7 @@ describe PrometheusService, models: true, caching: true do end describe '#deployment_metrics' do - let(:deployment) { build_stubbed(:deployment)} + let(:deployment) { build_stubbed(:deployment) } let(:deployment_query) { Gitlab::Prometheus::Queries::DeploymentQuery } around do |example| @@ -76,13 +76,16 @@ describe PrometheusService, models: true, caching: true do context 'with valid data' do subject { service.deployment_metrics(deployment) } + let(:fake_deployment_time) { 10 } before do stub_reactive_cache(service, prometheus_data, deployment_query, deployment.id) end it 'returns reactive data' do - is_expected.to eq(prometheus_data.merge(deployment_time: deployment.created_at.to_i)) + expect(deployment).to receive(:created_at).and_return(fake_deployment_time) + + expect(subject).to eq(prometheus_data.merge(deployment_time: fake_deployment_time)) end end end |