Merge branch 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master'

Backport of EE !4989

See merge request gitlab-org/gitlab-ce!18238

2 files changed, 104 insertions, 0 deletions

diff --git a/spec/lib/gitlab/git/raw_diff_change_spec.rb b/spec/lib/gitlab/git/raw_diff_change_spec.rb
new file mode 100644
index 00000000000..eedde34534f
--- /dev/null
+++ b/spec/lib/gitlab/git/raw_diff_change_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Gitlab::Git::RawDiffChange do
+  let(:raw_change) { }
+  let(:change) { described_class.new(raw_change) }
+
+  context 'bad input' do
+    let(:raw_change) { 'foo' }
+
+    it 'does not set most of the attrs' do
+      expect(change.blob_id).to eq('foo')
+      expect(change.operation).to eq(:unknown)
+      expect(change.old_path).to be_blank
+      expect(change.new_path).to be_blank
+      expect(change.blob_size).to be_blank
+    end
+  end
+
+  context 'adding a file' do
+    let(:raw_change) { '93e123ac8a3e6a0b600953d7598af629dec7b735 59 A  bar/branch-test.txt' }
+
+    it 'initialize the proper attrs' do
+      expect(change.operation).to eq(:added)
+      expect(change.old_path).to be_blank
+      expect(change.new_path).to eq('bar/branch-test.txt')
+      expect(change.blob_id).to be_present
+      expect(change.blob_size).to be_present
+    end
+  end
+
+  context 'renaming a file' do
+    let(:raw_change) { "85bc2f9753afd5f4fc5d7c75f74f8d526f26b4f3 107 R060\tfiles/js/commit.js.coffee\tfiles/js/commit.coffee" }
+
+    it 'initialize the proper attrs' do
+      expect(change.operation).to eq(:renamed)
+      expect(change.old_path).to eq('files/js/commit.js.coffee')
+      expect(change.new_path).to eq('files/js/commit.coffee')
+      expect(change.blob_id).to be_present
+      expect(change.blob_size).to be_present
+    end
+  end
+
+  context 'modifying a file' do
+    let(:raw_change) { 'c60514b6d3d6bf4bec1030f70026e34dfbd69ad5 824 M  README.md' }
+
+    it 'initialize the proper attrs' do
+      expect(change.operation).to eq(:modified)
+      expect(change.old_path).to eq('README.md')
+      expect(change.new_path).to eq('README.md')
+      expect(change.blob_id).to be_present
+      expect(change.blob_size).to be_present
+    end
+  end
+
+  context 'deleting a file' do
+    let(:raw_change) { '60d7a906c2fd9e4509aeb1187b98d0ea7ce827c9 15364 D  files/.DS_Store' }
+
+    it 'initialize the proper attrs' do
+      expect(change.operation).to eq(:deleted)
+      expect(change.old_path).to eq('files/.DS_Store')
+      expect(change.new_path).to be_nil
+      expect(change.blob_id).to be_present
+      expect(change.blob_size).to be_present
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index d3ab61746f4..1e00e8d2739 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1043,6 +1043,44 @@ describe Gitlab::Git::Repository, seed_helper: true do
     it { is_expected.to eq(17) }
   end
 
+  describe '#raw_changes_between' do
+    let(:old_rev) { }
+    let(:new_rev) { }
+    let(:changes) { repository.raw_changes_between(old_rev, new_rev) }
+
+    context 'initial commit' do
+      let(:old_rev) { Gitlab::Git::BLANK_SHA }
+      let(:new_rev) { '1a0b36b3cdad1d2ee32457c102a8c0b7056fa863' }
+
+      it 'returns the changes' do
+        expect(changes).to be_present
+        expect(changes.size).to eq(3)
+      end
+    end
+
+    context 'with an invalid rev' do
+      let(:old_rev) { 'foo' }
+      let(:new_rev) { 'bar' }
+
+      it 'returns an error' do
+        expect { changes }.to raise_error(Gitlab::Git::Repository::GitError)
+      end
+    end
+
+    context 'with valid revs' do
+      let(:old_rev) { 'fa1b1e6c004a68b7d8763b86455da9e6b23e36d6' }
+      let(:new_rev) { '4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6' }
+
+      it 'returns the changes' do
+        expect(changes.size).to eq(9)
+        expect(changes.first.operation).to eq(:modified)
+        expect(changes.first.new_path).to eq('.gitmodules')
+        expect(changes.last.operation).to eq(:added)
+        expect(changes.last.new_path).to eq('files/lfs/picture-invalid.png')
+      end
+    end
+  end
+
   describe '#merge_base' do
     shared_examples '#merge_base' do
       where(:from, :to, :result) do