diff options
author | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-26 02:55:00 +0300 |
---|---|---|
committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-28 08:30:13 +0300 |
commit | 72544449cfb8e35b8c044f5bfd08a2fae2253408 (patch) | |
tree | 9fb30b7c20955968f090a9f61582ad737f9afc4b /spec/models | |
parent | 7671c592f826f44be5a8a7dc947fba467f5df851 (diff) | |
download | gitlab-ce-id-change-total-notes-calculation.tar.gz |
Change the way totalNotes is calculatedid-change-total-notes-calculation
totalNotes is only used to prerender a number of
skeleton containers until real notes are loaded
issuable.discussions makes multiple requests, so
too expensive for this
This commit uses mere notes for this and sends
actual totalNotes number if it's less than 10;
otherwise it sends 10 - it allows us to avoid
bunch of skeleton prerenderings, which are not
necessary since they doesn't fit into the whole
screen and disappear quite fast
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/concerns/noteable_spec.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/models/concerns/noteable_spec.rb b/spec/models/concerns/noteable_spec.rb index e17b98536fa..929b5f52c7c 100644 --- a/spec/models/concerns/noteable_spec.rb +++ b/spec/models/concerns/noteable_spec.rb @@ -272,4 +272,22 @@ describe Noteable do expect(described_class.resolvable_types).to include('MergeRequest') end end + + describe '#capped_notes_count' do + context 'notes number < 10' do + it 'the number of notes is returned' do + expect(subject.capped_notes_count(10)).to eq(9) + end + end + + context 'notes number > 10' do + before do + create_list(:note, 2, project: project, noteable: subject) + end + + it '10 is returned' do + expect(subject.capped_notes_count(10)).to eq(10) + end + end + end end |