summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/issuable_metadata_spec.rb
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-02-26 17:59:26 +0000
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-02-26 17:59:26 +0000
commitf4be2d4e1bd4ac456610c72862f20ff29b3820a8 (patch)
tree3c581fe26b071b2b3084daed9ae46597b01ac701 /spec/lib/gitlab/issuable_metadata_spec.rb
parentf5201a816f2eff9393e16f362403451e5d86ee6c (diff)
downloadgitlab-ce-f4be2d4e1bd4ac456610c72862f20ff29b3820a8.tar.gz
Revert "Merge branch '56726-fix-n+1-in-issues-and-merge-requests-api' into 'master'"
This reverts merge request !25042
Diffstat (limited to 'spec/lib/gitlab/issuable_metadata_spec.rb')
-rw-r--r--spec/lib/gitlab/issuable_metadata_spec.rb8
1 files changed, 4 insertions, 4 deletions
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