diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-23 15:51:55 +0000 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-02-24 09:28:19 +0100 |
commit | 40d7c13dd63639149af7dec476f9be84653d28da (patch) | |
tree | fc50bed51437e6448f00e8cddba9be62e7fed5ea | |
parent | f948c2f4ec03c544a1453714189599d02bcd99e8 (diff) | |
download | gitlab-ce-40d7c13dd63639149af7dec476f9be84653d28da.tar.gz |
Merge branch 'fix-mr-size-with-over-100-files' into 'master'
Fix MR changes tab size count
Closes #27563
See merge request !9091
-rw-r--r-- | app/models/merge_request.rb | 6 | ||||
-rw-r--r-- | changelogs/unreleased/fix-mr-size-with-over-100-files.yml | 4 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 44 |
3 files changed, 53 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 10251302db8..ac316fb364f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -198,7 +198,11 @@ class MergeRequest < ActiveRecord::Base end def diff_size - opts = diff_options || {} + # The `#diffs` method ends up at an instance of a class inheriting from + # `Gitlab::Diff::FileCollection::Base`, so use those options as defaults + # here too, to get the same diff size without performing highlighting. + # + opts = Gitlab::Diff::FileCollection::Base.default_options.merge(diff_options || {}) raw_diffs(opts).size end diff --git a/changelogs/unreleased/fix-mr-size-with-over-100-files.yml b/changelogs/unreleased/fix-mr-size-with-over-100-files.yml new file mode 100644 index 00000000000..eecf3c99a75 --- /dev/null +++ b/changelogs/unreleased/fix-mr-size-with-over-100-files.yml @@ -0,0 +1,4 @@ +--- +title: Fix MR changes tab size count when there are over 100 files in the diff +merge_request: +author: diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 861426acbc3..d90577e1a84 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -209,6 +209,50 @@ describe MergeRequest, models: true do end end + describe '#diff_size' do + let(:merge_request) do + build(:merge_request, source_branch: 'expand-collapse-files', target_branch: 'master') + end + + context 'when there are MR diffs' do + before do + merge_request.save + end + + it 'returns the correct count' do + expect(merge_request.diff_size).to eq(105) + end + + it 'does not perform highlighting' do + expect(Gitlab::Diff::Highlight).not_to receive(:new) + + merge_request.diff_size + end + end + + context 'when there are no MR diffs' do + before do + merge_request.compare = CompareService.new( + merge_request.source_project, + merge_request.source_branch + ).execute( + merge_request.target_project, + merge_request.target_branch + ) + end + + it 'returns the correct count' do + expect(merge_request.diff_size).to eq(105) + end + + it 'does not perform highlighting' do + expect(Gitlab::Diff::Highlight).not_to receive(:new) + + merge_request.diff_size + end + end + end + describe "#related_notes" do let!(:merge_request) { create(:merge_request) } |