diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-12-07 17:09:22 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-12-07 17:09:22 +0000 |
commit | 30cf824b2a0cfb832849c3df0cf133da1c3c6ce4 (patch) | |
tree | 8701d0fd5ac901745031bfb230445adc9bd61486 /spec | |
parent | 420328d79e53c95d4aea3a098fe066aa43a25114 (diff) | |
parent | 7385e7cd47f1eaab355d2fd8ca91b9d056b4576d (diff) | |
download | gitlab-ce-30cf824b2a0cfb832849c3df0cf133da1c3c6ce4.tar.gz |
Merge branch 'ce-4326-one-notification-per-code-review' into 'master'
Backports changes made to One notification per code review
See merge request gitlab-org/gitlab-ce!23656
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/concerns/discussion_on_diff_spec.rb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/spec/models/concerns/discussion_on_diff_spec.rb b/spec/models/concerns/discussion_on_diff_spec.rb index 8cd129dc851..73eb7a1160d 100644 --- a/spec/models/concerns/discussion_on_diff_spec.rb +++ b/spec/models/concerns/discussion_on_diff_spec.rb @@ -12,6 +12,34 @@ describe DiscussionOnDiff do expect(truncated_lines.count).to be <= DiffDiscussion::NUMBER_OF_TRUNCATED_DIFF_LINES end + + context 'with truncated diff lines diff limit set' do + let(:truncated_lines) do + subject.truncated_diff_lines( + diff_limit: diff_limit + ) + end + + context 'when diff limit is higher than default' do + let(:diff_limit) { DiffDiscussion::NUMBER_OF_TRUNCATED_DIFF_LINES + 1 } + + it 'returns fewer lines than the default' do + expect(subject.diff_lines.count).to be > diff_limit + + expect(truncated_lines.count).to be <= DiffDiscussion::NUMBER_OF_TRUNCATED_DIFF_LINES + end + end + + context 'when diff_limit is lower than default' do + let(:diff_limit) { 3 } + + it 'returns fewer lines than the default' do + expect(subject.diff_lines.count).to be > DiffDiscussion::NUMBER_OF_TRUNCATED_DIFF_LINES + + expect(truncated_lines.count).to be <= diff_limit + end + end + end end context "when some diff lines are meta" do |