diff options
| -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 c9df678f97e..217f753f05f 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -60,7 +60,7 @@ class PrometheusService < MonitoringService    def deployment_metrics(deployment)      metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &method(:rename_data_to_metrics)) -    metrics&.merge(deployment_time: created_at.to_i) || {} +    metrics&.merge(deployment_time: deployment.created_at.to_i) || {}    end    def additional_environment_metrics(environment) diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb index c914b32f7a4..37f23b1243c 100644 --- a/spec/models/project_services/prometheus_service_spec.rb +++ b/spec/models/project_services/prometheus_service_spec.rb @@ -71,7 +71,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| @@ -80,13 +80,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_metrics_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_metrics_data.merge(deployment_time: fake_deployment_time))        end      end    end | 
