diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-21 09:17:00 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-21 09:17:00 +0530 |
| commit | cc3adcd4bffe262f8581354b8190869f94ef17f2 (patch) | |
| tree | 46c20d0d7a9b473fcbc716930ec7cf5b70b8e6ae | |
| parent | ef8badb6a7db5719f78eaccae5826b3543dc0c7b (diff) | |
| download | gitlab-ce-cc3adcd4bffe262f8581354b8190869f94ef17f2.tar.gz | |
Fix `CreateDeploymentService` spec.
1. The spec tests that if:
- The merge request is merged
- The target branch is deployed to production
- The `first_deployed_to_production_at` metric is `nil` (for some reason)
- The target branch is deployed to production again
- The `first_deployed_to_production_at` metric stays as `nil` (and is
not overwritten).
2. Failure only on MySQL due to some datetime weirdness.
| -rw-r--r-- | spec/services/create_deployment_service_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb index cfcf1dc4ab8..343b4385bf2 100644 --- a/spec/services/create_deployment_service_spec.rb +++ b/spec/services/create_deployment_service_spec.rb @@ -229,8 +229,11 @@ describe CreateDeploymentService, services: true do context "if the 'first_deployed_to_production_at' time is not already set" do it "does not overwrite the older 'first_deployed_to_production_at' time" do # Previous deploy - time = Time.now + time = 5.minutes.from_now Timecop.freeze(time) { service.execute } + + expect(merge_request.reload.metrics.merged_at).to be < merge_request.reload.metrics.first_deployed_to_production_at + merge_request.reload.metrics.update(first_deployed_to_production_at: nil) expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_nil |