Backport EE changes for productivity analytics

Improve diff lines count efficiency

1 files changed, 69 insertions, 0 deletions

diff --git a/spec/lib/gitlab/git/diff_collection_spec.rb b/spec/lib/gitlab/git/diff_collection_spec.rb
index 81658874be7..be6ab0c1200 100644
--- a/spec/lib/gitlab/git/diff_collection_spec.rb
+++ b/spec/lib/gitlab/git/diff_collection_spec.rb
@@ -74,6 +74,11 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           end
         end
 
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq file_count * line_count }
+        end
+
         context 'when limiting is disabled' do
           let(:limits) { false }
 
@@ -100,6 +105,11 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
               expect(subject.size).to eq(3)
             end
           end
+
+          describe '#line_count' do
+            subject { super().line_count }
+            it { is_expected.to eq file_count * line_count }
+          end
         end
       end
 
@@ -120,6 +130,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           subject { super().real_size }
           it { is_expected.to eq('0+') }
         end
+
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq 1000 }
+        end
+
         it { expect(subject.size).to eq(0) }
 
         context 'when limiting is disabled' do
@@ -139,6 +155,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
             subject { super().real_size }
             it { is_expected.to eq('3') }
           end
+
+          describe '#line_count' do
+            subject { super().line_count }
+            it { is_expected.to eq file_count * line_count }
+          end
+
           it { expect(subject.size).to eq(3) }
         end
       end
@@ -164,6 +186,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           subject { super().real_size }
           it { is_expected.to eq('10+') }
         end
+
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq 10 }
+        end
+
         it { expect(subject.size).to eq(10) }
 
         context 'when limiting is disabled' do
@@ -183,6 +211,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
             subject { super().real_size }
             it { is_expected.to eq('11') }
           end
+
+          describe '#line_count' do
+            subject { super().line_count }
+            it { is_expected.to eq file_count * line_count }
+          end
+
           it { expect(subject.size).to eq(11) }
         end
       end
@@ -204,6 +238,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           subject { super().real_size }
           it { is_expected.to eq('3+') }
         end
+
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq 120 }
+        end
+
         it { expect(subject.size).to eq(3) }
 
         context 'when limiting is disabled' do
@@ -223,6 +263,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
             subject { super().real_size }
             it { is_expected.to eq('11') }
           end
+
+          describe '#line_count' do
+            subject { super().line_count }
+            it { is_expected.to eq file_count * line_count }
+          end
+
           it { expect(subject.size).to eq(11) }
         end
       end
@@ -248,6 +294,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           subject { super().real_size }
           it { is_expected.to eq('10') }
         end
+
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq file_count * line_count }
+        end
+
         it { expect(subject.size).to eq(10) }
       end
     end
@@ -270,6 +322,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
         subject { super().real_size }
         it { is_expected.to eq('9+') }
       end
+
+      describe '#line_count' do
+        subject { super().line_count }
+        it { is_expected.to eq file_count * line_count }
+      end
+
       it { expect(subject.size).to eq(9) }
 
       context 'when limiting is disabled' do
@@ -289,6 +347,12 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
           subject { super().real_size }
           it { is_expected.to eq('10') }
         end
+
+        describe '#line_count' do
+          subject { super().line_count }
+          it { is_expected.to eq file_count * line_count }
+        end
+
         it { expect(subject.size).to eq(10) }
       end
     end
@@ -316,6 +380,11 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
       subject { super().real_size }
       it { is_expected.to eq('0')}
     end
+
+    describe '#line_count' do
+      subject { super().line_count }
+      it { is_expected.to eq 0 }
+    end
   end
 
   describe '#each' do