From 39fa7d1eeb2dba52f0601128f3ac91f57d19866e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 27 Mar 2020 12:07:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/requests/api/merge_requests_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/requests/api/merge_requests_spec.rb') diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index d8fac47d6f6..a3fd365771b 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -910,13 +910,13 @@ describe API::MergeRequests do get api("/projects/#{project.id}/merge_requests/#{merge_request.reload.iid}", user) expect(json_response['merged_by']['id']).to eq(merge_request.metrics.merged_by_id) - expect(Time.parse json_response['merged_at']).to be_like_time(merge_request.metrics.merged_at) + expect(Time.parse(json_response['merged_at'])).to be_like_time(merge_request.metrics.merged_at) expect(json_response['closed_by']['id']).to eq(merge_request.metrics.latest_closed_by_id) - expect(Time.parse json_response['closed_at']).to be_like_time(merge_request.metrics.latest_closed_at) + expect(Time.parse(json_response['closed_at'])).to be_like_time(merge_request.metrics.latest_closed_at) expect(json_response['pipeline']['id']).to eq(merge_request.metrics.pipeline_id) - expect(Time.parse json_response['latest_build_started_at']).to be_like_time(merge_request.metrics.latest_build_started_at) - expect(Time.parse json_response['latest_build_finished_at']).to be_like_time(merge_request.metrics.latest_build_finished_at) - expect(Time.parse json_response['first_deployed_to_production_at']).to be_like_time(merge_request.metrics.first_deployed_to_production_at) + expect(Time.parse(json_response['latest_build_started_at'])).to be_like_time(merge_request.metrics.latest_build_started_at) + expect(Time.parse(json_response['latest_build_finished_at'])).to be_like_time(merge_request.metrics.latest_build_finished_at) + expect(Time.parse(json_response['first_deployed_to_production_at'])).to be_like_time(merge_request.metrics.first_deployed_to_production_at) end end -- cgit v1.2.3