diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-21 00:21:43 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-21 00:29:17 +0300 |
commit | 0a2649ce694a0ba70fa6c4caa84ea21dd53446c8 (patch) | |
tree | 4bcba7e734c719d9be45a4e3f00a0e5f5ee2a949 /spec | |
parent | b5dc0c6da55c7066746ee365c0248e82c849c944 (diff) |
Fix build.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 6 | ||||
-rw-r--r-- | spec/services/create_deployment_service_spec.rb | 6 | ||||
-rw-r--r-- | spec/services/git_push_service_spec.rb | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 70051e4516d..550a890797e 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -197,13 +197,13 @@ describe Ci::Pipeline, models: true do time = Time.now Timecop.freeze(time) { build.run } - expect(merge_request.metrics.latest_build_started_at).to be_within(1.second).of(time) + expect(merge_request.reload.metrics.latest_build_started_at).to be_within(1.second).of(time) end it 'clears the build end time' do build.run - expect(merge_request.metrics.latest_build_finished_at).to be_nil + expect(merge_request.reload.metrics.latest_build_finished_at).to be_nil end end @@ -213,7 +213,7 @@ describe Ci::Pipeline, models: true do time = Time.now Timecop.freeze(time) { build.success } - expect(merge_request.metrics.latest_build_finished_at).to be_within(1.second).of(time) + expect(merge_request.reload.metrics.latest_build_finished_at).to be_within(1.second).of(time) end end end diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb index 3a565fa44b5..cfcf1dc4ab8 100644 --- a/spec/services/create_deployment_service_spec.rb +++ b/spec/services/create_deployment_service_spec.rb @@ -190,7 +190,7 @@ describe CreateDeploymentService, services: true do time = Time.now Timecop.freeze(time) { service.execute } - expect(merge_request.metrics.first_deployed_to_production_at).to be_within(1.second).of(time) + expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_within(1.second).of(time) end it "doesn't set the time if the deploy's environment is not 'production'" do @@ -198,7 +198,7 @@ describe CreateDeploymentService, services: true do service = described_class.new(project, user, staging_params) service.execute - expect(merge_request.metrics.first_deployed_to_production_at).to be_nil + expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_nil end it 'does not raise errors if the merge request does not have a metrics record' do @@ -231,7 +231,7 @@ describe CreateDeploymentService, services: true do # Previous deploy time = Time.now Timecop.freeze(time) { service.execute } - merge_request.metrics.update(first_deployed_to_production_at: nil) + merge_request.reload.metrics.update(first_deployed_to_production_at: nil) expect(merge_request.reload.metrics.first_deployed_to_production_at).to be_nil diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index cdf0d44a32b..22991c5bc86 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -364,14 +364,14 @@ describe GitPushService, services: true do it 'sets the metric for referenced issues' do execute_service(project, user, @oldrev, @newrev, @ref) - expect(issue.metrics.first_mentioned_in_commit_at).to be_within(1.second).of(commit_time) + expect(issue.reload.metrics.first_mentioned_in_commit_at).to be_within(1.second).of(commit_time) end it 'does not set the metric for non-referenced issues' do non_referenced_issue = create(:issue, project: project) execute_service(project, user, @oldrev, @newrev, @ref) - expect(non_referenced_issue.metrics.first_mentioned_in_commit_at).to be_nil + expect(non_referenced_issue.reload.metrics.first_mentioned_in_commit_at).to be_nil end end end |