7 files changed, 138 insertions, 75 deletions

diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index a3dff6d0d4b..3815055139a 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -65,34 +65,12 @@ describe Gitlab::Git::Commit, seed_helper: true do
   end
 
   describe "Commit info from gitaly commit" do
-    let(:id) { 'f00' }
-    let(:parent_ids) { %w(b45 b46) }
     let(:subject) { "My commit".force_encoding('ASCII-8BIT') }
     let(:body) { subject + "My body".force_encoding('ASCII-8BIT') }
-    let(:committer) do
-      Gitaly::CommitAuthor.new(
-        name: generate(:name),
-        email: generate(:email),
-        date: Google::Protobuf::Timestamp.new(seconds: 123)
-      )
-    end
-    let(:author) do
-      Gitaly::CommitAuthor.new(
-        name: generate(:name),
-        email: generate(:email),
-        date: Google::Protobuf::Timestamp.new(seconds: 456)
-      )
-    end
-    let(:gitaly_commit) do
-      Gitaly::GitCommit.new(
-        id: id,
-        subject: subject,
-        body: body,
-        author: author,
-        committer: committer,
-        parent_ids: parent_ids
-      )
-    end
+    let(:gitaly_commit) { build(:gitaly_commit, subject: subject, body: body) }
+    let(:id) { gitaly_commit.id }
+    let(:committer) { gitaly_commit.committer }
+    let(:author) { gitaly_commit.author }
     let(:commit) { described_class.new(repository, gitaly_commit) }
 
     it { expect(commit.short_id).to eq(id[0..10]) }
@@ -104,7 +82,7 @@ describe Gitlab::Git::Commit, seed_helper: true do
     it { expect(commit.author_name).to eq(author.name) }
     it { expect(commit.committer_name).to eq(committer.name) }
     it { expect(commit.committer_email).to eq(committer.email) }
-    it { expect(commit.parent_ids).to eq(parent_ids) }
+    it { expect(commit.parent_ids).to eq(gitaly_commit.parent_ids) }
 
     context 'no body' do
       let(:body) { "".force_encoding('ASCII-8BIT') }
diff --git a/spec/lib/gitlab/git/diff_collection_spec.rb b/spec/lib/gitlab/git/diff_collection_spec.rb
index 3494f0cc98d..ee657101f4c 100644
--- a/spec/lib/gitlab/git/diff_collection_spec.rb
+++ b/spec/lib/gitlab/git/diff_collection_spec.rb
@@ -341,8 +341,7 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
     end
 
     context 'when diff is quite large will collapse by default' do
-      let(:iterator) { [{ diff: 'a' * (Gitlab::Git::Diff.collapse_limit + 1) }] }
-      let(:max_files) { 100 }
+      let(:iterator) { [{ diff: 'a' * 20480 }] }
 
       context 'when no collapse is set' do
         let(:expanded) { true }
diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index d39b33a0c05..4a7b06003fc 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -31,36 +31,6 @@ EOT
                                           [".gitmodules"]).patches.first
   end
 
-  describe 'size limit feature toggles' do
-    context 'when the feature gitlab_git_diff_size_limit_increase is enabled' do
-      before do
-        stub_feature_flags(gitlab_git_diff_size_limit_increase: true)
-      end
-
-      it 'returns 200 KB for size_limit' do
-        expect(described_class.size_limit).to eq(200.kilobytes)
-      end
-
-      it 'returns 100 KB for collapse_limit' do
-        expect(described_class.collapse_limit).to eq(100.kilobytes)
-      end
-    end
-
-    context 'when the feature gitlab_git_diff_size_limit_increase is disabled' do
-      before do
-        stub_feature_flags(gitlab_git_diff_size_limit_increase: false)
-      end
-
-      it 'returns 100 KB for size_limit' do
-        expect(described_class.size_limit).to eq(100.kilobytes)
-      end
-
-      it 'returns 10 KB for collapse_limit' do
-        expect(described_class.collapse_limit).to eq(10.kilobytes)
-      end
-    end
-  end
-
   describe '.new' do
     context 'using a Hash' do
       context 'with a small diff' do
@@ -77,7 +47,7 @@ EOT
 
       context 'using a diff that is too large' do
         it 'prunes the diff' do
-          diff = described_class.new(diff: 'a' * (described_class.size_limit + 1))
+          diff = described_class.new(diff: 'a' * 204800)
 
           expect(diff.diff).to be_empty
           expect(diff).to be_too_large
@@ -115,8 +85,8 @@ EOT
           # The patch total size is 200, with lines between 21 and 54.
           # This is a quick-and-dirty way to test this. Ideally, a new patch is
           # added to the test repo with a size that falls between the real limits.
-          allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(150)
-          allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(100)
+          stub_const("#{described_class}::SIZE_LIMIT", 150)
+          stub_const("#{described_class}::COLLAPSE_LIMIT", 100)
         end
 
         it 'prunes the diff as a large diff instead of as a collapsed diff' do
@@ -356,7 +326,7 @@ EOT
 
   describe '#collapsed?' do
     it 'returns true for a diff that is quite large' do
-      diff = described_class.new({ diff: 'a' * (described_class.collapse_limit + 1) }, expanded: false)
+      diff = described_class.new({ diff: 'a' * 20480 }, expanded: false)
 
       expect(diff).to be_collapsed
     end
diff --git a/spec/lib/gitlab/git/hook_spec.rb b/spec/lib/gitlab/git/hook_spec.rb
index 0ff4f3bd105..2fe1f5603ce 100644
--- a/spec/lib/gitlab/git/hook_spec.rb
+++ b/spec/lib/gitlab/git/hook_spec.rb
@@ -14,6 +14,7 @@ describe Gitlab::Git::Hook do
     let(:repo_path) { repository.path }
     let(:user) { create(:user) }
     let(:gl_id) { Gitlab::GlId.gl_id(user) }
+    let(:gl_username) { user.username }
 
     def create_hook(name)
       FileUtils.mkdir_p(File.join(repo_path, 'hooks'))
@@ -42,6 +43,7 @@ describe Gitlab::Git::Hook do
           let(:env) do
             {
               'GL_ID' => gl_id,
+              'GL_USERNAME' => gl_username,
               'PWD' => repo_path,
               'GL_PROTOCOL' => 'web',
               'GL_REPOSITORY' => gl_repository
@@ -59,7 +61,7 @@ describe Gitlab::Git::Hook do
                 .with(env, hook_path, chdir: repo_path).and_call_original
             end
 
-            status, errors = hook.trigger(gl_id, blank, blank, ref)
+            status, errors = hook.trigger(gl_id, gl_username, blank, blank, ref)
             expect(status).to be true
             expect(errors).to be_blank
           end
@@ -72,7 +74,7 @@ describe Gitlab::Git::Hook do
             blank = Gitlab::Git::BLANK_SHA
             ref = Gitlab::Git::BRANCH_REF_PREFIX + 'new_branch'
 
-            status, errors = hook.trigger(gl_id, blank, blank, ref)
+            status, errors = hook.trigger(gl_id, gl_username, blank, blank, ref)
             expect(status).to be false
             expect(errors).to eq("error message from the hook<br>error message from the hook line 2<br>")
           end
@@ -86,7 +88,7 @@ describe Gitlab::Git::Hook do
         blank = Gitlab::Git::BLANK_SHA
         ref = Gitlab::Git::BRANCH_REF_PREFIX + 'new_branch'
 
-        status, errors = hook.trigger(gl_id, blank, blank, ref)
+        status, errors = hook.trigger(gl_id, gl_username, blank, blank, ref)
         expect(status).to be true
         expect(errors).to be_nil
       end
diff --git a/spec/lib/gitlab/git/hooks_service_spec.rb b/spec/lib/gitlab/git/hooks_service_spec.rb
index d4d75b66659..51e4e3fdad1 100644
--- a/spec/lib/gitlab/git/hooks_service_spec.rb
+++ b/spec/lib/gitlab/git/hooks_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Git::HooksService, seed_helper: true do
-  let(:user) { Gitlab::Git::User.new('Jane Doe', 'janedoe@example.com', 'user-456') }
+  let(:user) { Gitlab::Git::User.new('janedoe', 'Jane Doe', 'janedoe@example.com', 'user-456') }
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, 'project-123') }
   let(:service) { described_class.new }
 
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 4fc26c625a5..a0482e30a33 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -389,6 +389,40 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
+  describe '#has_local_branches?' do
+    shared_examples 'check for local branches' do
+      it { expect(repository.has_local_branches?).to eq(true) }
+
+      context 'mutable' do
+        let(:repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
+
+        after do
+          ensure_seeds
+        end
+
+        it 'returns false when there are no branches' do
+          # Sanity check
+          expect(repository.has_local_branches?).to eq(true)
+
+          FileUtils.rm_rf(File.join(repository.path, 'packed-refs'))
+          heads_dir = File.join(repository.path, 'refs/heads')
+          FileUtils.rm_rf(heads_dir)
+          FileUtils.mkdir_p(heads_dir)
+
+          expect(repository.has_local_branches?).to eq(false)
+        end
+      end
+    end
+
+    context 'with gitaly' do
+      it_behaves_like 'check for local branches'
+    end
+
+    context 'without gitaly', skip_gitaly_mock: true do
+      it_behaves_like 'check for local branches'
+    end
+  end
+
   describe "#delete_branch" do
     shared_examples "deleting a branch" do
       let(:repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
@@ -1332,6 +1366,84 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
+  describe '#with_repo_branch_commit' do
+    context 'when comparing with the same repository' do
+      let(:start_repository) { repository }
+
+      context 'when the branch exists' do
+        let(:start_branch_name) { 'master' }
+
+        it 'yields the commit' do
+          expect { |b| repository.with_repo_branch_commit(start_repository, start_branch_name, &b) }
+            .to yield_with_args(an_instance_of(Gitlab::Git::Commit))
+        end
+      end
+
+      context 'when the branch does not exist' do
+        let(:start_branch_name) { 'definitely-not-master' }
+
+        it 'yields nil' do
+          expect { |b| repository.with_repo_branch_commit(start_repository, start_branch_name, &b) }
+            .to yield_with_args(nil)
+        end
+      end
+    end
+
+    context 'when comparing with another repository' do
+      let(:start_repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
+
+      context 'when the branch exists' do
+        let(:start_branch_name) { 'master' }
+
+        it 'yields the commit' do
+          expect { |b| repository.with_repo_branch_commit(start_repository, start_branch_name, &b) }
+            .to yield_with_args(an_instance_of(Gitlab::Git::Commit))
+        end
+      end
+
+      context 'when the branch does not exist' do
+        let(:start_branch_name) { 'definitely-not-master' }
+
+        it 'yields nil' do
+          expect { |b| repository.with_repo_branch_commit(start_repository, start_branch_name, &b) }
+            .to yield_with_args(nil)
+        end
+      end
+    end
+  end
+
+  describe '#fetch_source_branch' do
+    let(:local_ref) { 'refs/merge-requests/1/head' }
+
+    context 'when the branch exists' do
+      let(:source_branch) { 'master' }
+
+      it 'writes the ref' do
+        expect(repository).to receive(:write_ref).with(local_ref, /\h{40}/)
+
+        repository.fetch_source_branch(repository, source_branch, local_ref)
+      end
+
+      it 'returns true' do
+        expect(repository.fetch_source_branch(repository, source_branch, local_ref)).to eq(true)
+      end
+    end
+
+    context 'when the branch does not exist' do
+      let(:source_branch) { 'definitely-not-master' }
+
+      it 'does not write the ref' do
+        expect(repository).not_to receive(:write_ref)
+
+        repository.fetch_source_branch(repository, source_branch, local_ref)
+      end
+
+      it 'returns false' do
+        expect(repository.fetch_source_branch(repository, source_branch, local_ref)).to eq(false)
+      end
+    end
+  end
+
   def create_remote_branch(repository, remote_name, branch_name, source_branch_name)
     source_branch = repository.branches.find { |branch| branch.name == source_branch_name }
     rugged = repository.rugged
diff --git a/spec/lib/gitlab/git/user_spec.rb b/spec/lib/gitlab/git/user_spec.rb
index 0ebcecb26c0..ab64b041187 100644
--- a/spec/lib/gitlab/git/user_spec.rb
+++ b/spec/lib/gitlab/git/user_spec.rb
@@ -1,22 +1,24 @@
 require 'spec_helper'
 
 describe Gitlab::Git::User do
+  let(:username) { 'janedo' }
   let(:name) { 'Jane Doe' }
   let(:email) { 'janedoe@example.com' }
   let(:gl_id) { 'user-123' }
 
-  subject { described_class.new(name, email, gl_id) }
+  subject { described_class.new(username, name, email, gl_id) }
 
   describe '#==' do
-    def eq_other(name, email, gl_id)
-      eq(described_class.new(name, email, gl_id))
+    def eq_other(username, name, email, gl_id)
+      eq(described_class.new(username, name, email, gl_id))
     end
 
-    it { expect(subject).to eq_other(name, email, gl_id) }
+    it { expect(subject).to eq_other(username, name, email, gl_id) }
 
-    it { expect(subject).not_to eq_other(nil, nil, nil) }
-    it { expect(subject).not_to eq_other(name + 'x', email, gl_id) }
-    it { expect(subject).not_to eq_other(name, email + 'x', gl_id) }
-    it { expect(subject).not_to eq_other(name, email, gl_id + 'x') }
+    it { expect(subject).not_to eq_other(nil, nil, nil, nil) }
+    it { expect(subject).not_to eq_other(username + 'x', name, email, gl_id) }
+    it { expect(subject).not_to eq_other(username, name + 'x', email, gl_id) }
+    it { expect(subject).not_to eq_other(username, name, email + 'x', gl_id) }
+    it { expect(subject).not_to eq_other(username, name, email, gl_id + 'x') }
   end
 end