Merge branch '37824-many-branches-lock-server' into 'master'

Project with many branches can lock server running "git branch --contains XXX"

Closes #37824

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

2 files changed, 131 insertions, 4 deletions

diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 4612fc6e441..5dc27e2bbba 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -134,8 +134,8 @@ describe Projects::CommitController do
     end
   end
 
-  describe "GET branches" do
-    it "contains branch and tags information" do
+  describe 'GET branches' do
+    it 'contains branch and tags information' do
       commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
 
       get(:branches,
@@ -143,8 +143,26 @@ describe Projects::CommitController do
           project_id: project,
           id: commit.id)
 
-      expect(assigns(:branches)).to include("master", "feature_conflict")
-      expect(assigns(:tags)).to include("v1.1.0")
+      expect(assigns(:branches)).to include('master', 'feature_conflict')
+      expect(assigns(:branches_limit_exceeded)).to be_falsey
+      expect(assigns(:tags)).to include('v1.1.0')
+      expect(assigns(:tags_limit_exceeded)).to be_falsey
+    end
+
+    it 'returns :limit_exceeded when number of branches/tags reach a threshhold' do
+      commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
+      allow_any_instance_of(Repository).to receive(:branch_count).and_return(1001)
+      allow_any_instance_of(Repository).to receive(:tag_count).and_return(1001)
+
+      get(:branches,
+          namespace_id: project.namespace,
+          project_id: project,
+          id: commit.id)
+
+      expect(assigns(:branches)).to eq([])
+      expect(assigns(:branches_limit_exceeded)).to be_truthy
+      expect(assigns(:tags)).to eq([])
+      expect(assigns(:tags_limit_exceeded)).to be_truthy
     end
   end
 
diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb
new file mode 100644
index 00000000000..b9d4dc80fe0
--- /dev/null
+++ b/spec/views/projects/commit/branches.html.haml_spec.rb
@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe 'projects/commit/branches.html.haml' do
+  let(:project) { create(:project, :repository) }
+
+  before do
+    assign(:project, project)
+  end
+
+  context 'when branches and tags are available' do
+    before do
+      assign(:branches, ['master', 'test-branch'])
+      assign(:branches_limit_exceeded, false)
+      assign(:tags, ['tag1'])
+      assign(:tags_limit_exceeded, false)
+
+      render
+    end
+
+    it 'shows default branch' do
+      expect(rendered).to have_link('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows branch and tag links' do
+      expect(rendered).to have_link('test-branch')
+      expect(rendered).to have_link('tag1')
+    end
+  end
+
+  context 'when branches are available but no tags' do
+    before do
+      assign(:branches, ['master', 'test-branch'])
+      assign(:branches_limit_exceeded, false)
+      assign(:tags, [])
+      assign(:tags_limit_exceeded, true)
+
+      render
+    end
+
+    it 'shows branches' do
+      expect(rendered).to have_link('master')
+      expect(rendered).to have_link('test-branch')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows limit exceeded message for tags' do
+      expect(rendered).to have_text('Tags unavailable')
+    end
+  end
+
+  context 'when tags are available but no branches (just default)' do
+    before do
+      assign(:branches, ['master'])
+      assign(:branches_limit_exceeded, true)
+      assign(:tags, %w(tag1 tag2))
+      assign(:tags_limit_exceeded, false)
+
+      render
+    end
+
+    it 'shows default branch' do
+      expect(rendered).to have_text('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows tags' do
+      expect(rendered).to have_link('tag1')
+      expect(rendered).to have_link('tag2')
+    end
+
+    it 'shows limit exceeded for branches' do
+      expect(rendered).to have_text('Branches unavailable')
+    end
+  end
+
+  context 'when branches and tags are not available' do
+    before do
+      assign(:branches, ['master'])
+      assign(:branches_limit_exceeded, true)
+      assign(:tags, [])
+      assign(:tags_limit_exceeded, true)
+
+      render
+    end
+
+    it 'shows default branch' do
+      expect(rendered).to have_text('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows too many to search' do
+      expect(rendered).to have_text('Branches unavailable')
+      expect(rendered).to have_text('Tags unavailable')
+    end
+  end
+end