summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-06-26 16:24:47 +0000
committerRobert Speicher <robert@gitlab.com>2017-06-26 16:24:47 +0000
commit398bdce19010ea2be1092ec61b8d6c60e6dddf00 (patch)
treeb3f01e4fed6f3e7e3022d782fd6418d7fcb28ca2 /spec/models
parent831054a79d20e7af01106d9b1ac5a18965a51dc8 (diff)
parente00f487049e811c497ba3780f38f7e1a8572ad97 (diff)
downloadgitlab-ce-398bdce19010ea2be1092ec61b8d6c60e6dddf00.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
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_services/prometheus_service_spec.rb7
1 files changed, 5 insertions, 2 deletions
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