Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4

3 files changed, 99 insertions, 0 deletions

diff --git a/spec/models/external_issue_spec.rb b/spec/models/external_issue_spec.rb
index 6ec6b9037a4..9b144dd1ecc 100644
--- a/spec/models/external_issue_spec.rb
+++ b/spec/models/external_issue_spec.rb
@@ -10,6 +10,21 @@ describe ExternalIssue, models: true do
     it { is_expected.to include_module(Referable) }
   end
 
+  describe '.reference_pattern' do
+    it 'allows underscores in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+
+    it 'allows numbers in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT3_EXT-1234')[0]).to eq 'EXT3_EXT-1234'
+    end
+
+    it 'requires the project name to begin with A-Z' do
+      expect(ExternalIssue.reference_pattern.match('3EXT_EXT-1234')).to eq nil
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+  end
+
   describe '#to_reference' do
     it 'returns a String reference to the object' do
       expect(issue.to_reference).to eq issue.id
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index afbf62035ac..c484ae8fc8c 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -219,4 +219,24 @@ describe Repository, models: true do
       end
     end
   end
+
+  describe '#has_visible_content?' do
+    subject { repository.has_visible_content? }
+
+    describe 'when there are no branches' do
+      before do
+        allow(repository.raw_repository).to receive(:branch_count).and_return(0)
+      end
+
+      it { is_expected.to eq(false) }
+    end
+
+    describe 'when there are branches' do
+      before do
+        allow(repository.raw_repository).to receive(:branch_count).and_return(3)
+      end
+
+      it { is_expected.to eq(true) }
+    end
+  end
 end
diff --git a/spec/models/tree_spec.rb b/spec/models/tree_spec.rb
new file mode 100644
index 00000000000..0737999e125
--- /dev/null
+++ b/spec/models/tree_spec.rb
@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Tree, models: true do
+  let(:repository) { create(:project).repository }
+  let(:sha) { repository.root_ref }
+
+  subject { described_class.new(repository, '54fcc214') }
+
+  describe '#readme' do
+    class FakeBlob
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def readme?
+        name =~ /^readme/i
+      end
+    end
+
+    it 'returns nil when repository does not contains a README file' do
+      files = [FakeBlob.new('file'), FakeBlob.new('license'), FakeBlob.new('copying')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme).to eq nil
+    end
+
+    it 'returns nil when repository does not contains a previewable README file' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README.pages'), FakeBlob.new('README.png')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme).to eq nil
+    end
+
+    it 'returns README when repository contains a previewable README file' do
+      files = [FakeBlob.new('README.png'), FakeBlob.new('README'), FakeBlob.new('file')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README'
+    end
+
+    it 'returns first previewable README when repository contains more than one' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README.md'), FakeBlob.new('README.asciidoc')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README.md'
+    end
+
+    it 'returns first plain text README when repository contains more than one' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README'), FakeBlob.new('README.txt')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README'
+    end
+
+    it 'prioritizes previewable README file over one in plain text' do
+      files = [FakeBlob.new('file'), FakeBlob.new('README'), FakeBlob.new('README.md')]
+      expect(subject).to receive(:blobs).and_return(files)
+
+      expect(subject.readme.name).to eq 'README.md'
+    end
+  end
+end