From f4be2d4e1bd4ac456610c72862f20ff29b3820a8 Mon Sep 17 00:00:00 2001 From: Heinrich Lee Yu Date: Tue, 26 Feb 2019 17:59:26 +0000 Subject: Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'" This reverts merge request !25042 --- spec/lib/gitlab/issuable_metadata_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/lib') diff --git a/spec/lib/gitlab/issuable_metadata_spec.rb b/spec/lib/gitlab/issuable_metadata_spec.rb index 6ec86163233..42635a68ee1 100644 --- a/spec/lib/gitlab/issuable_metadata_spec.rb +++ b/spec/lib/gitlab/issuable_metadata_spec.rb @@ -28,12 +28,12 @@ describe Gitlab::IssuableMetadata do expect(data.count).to eq(2) expect(data[issue.id].upvotes).to eq(1) expect(data[issue.id].downvotes).to eq(0) - expect(data[issue.id].user_notes_count).to eq(0) + expect(data[issue.id].notes_count).to eq(0) expect(data[issue.id].merge_requests_count).to eq(1) expect(data[closed_issue.id].upvotes).to eq(0) expect(data[closed_issue.id].downvotes).to eq(1) - expect(data[closed_issue.id].user_notes_count).to eq(0) + expect(data[closed_issue.id].notes_count).to eq(0) expect(data[closed_issue.id].merge_requests_count).to eq(0) end end @@ -51,12 +51,12 @@ describe Gitlab::IssuableMetadata do expect(data.count).to eq(2) expect(data[merge_request.id].upvotes).to eq(1) expect(data[merge_request.id].downvotes).to eq(1) - expect(data[merge_request.id].user_notes_count).to eq(1) + expect(data[merge_request.id].notes_count).to eq(1) expect(data[merge_request.id].merge_requests_count).to eq(0) expect(data[merge_request_closed.id].upvotes).to eq(0) expect(data[merge_request_closed.id].downvotes).to eq(0) - expect(data[merge_request_closed.id].user_notes_count).to eq(0) + expect(data[merge_request_closed.id].notes_count).to eq(0) expect(data[merge_request_closed.id].merge_requests_count).to eq(0) end end -- cgit v1.2.3