summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-02 11:15:04 +0100
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-02 12:26:04 +0100
commitbe0af5e69fc60bf629130290b49dee07510359a3 (patch)
tree43ec6b2899622206fe6319c434f82e991af365bf
parent133c1a7cc3f1441bf18c886c30681953992b38c9 (diff)
downloadgitlab-ce-be0af5e69fc60bf629130290b49dee07510359a3.tar.gz
Test type of README file without extension
-rw-r--r--lib/gitlab/file_detector.rb2
-rw-r--r--spec/lib/gitlab/file_detector_spec.rb5
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/file_detector.rb b/lib/gitlab/file_detector.rb
index 898dc7b0e23..d6338b09e3d 100644
--- a/lib/gitlab/file_detector.rb
+++ b/lib/gitlab/file_detector.rb
@@ -8,7 +8,7 @@ module Gitlab
module FileDetector
PATTERNS = {
# Project files
- readme: %r{\A(readme|index)[^\/]*\z}i,
+ readme: %r{\A(readme|index)[^/]*\z}i,
changelog: %r{\A(changelog|history|changes|news)[^/]*\z}i,
license: %r{\A((un)?licen[sc]e|copying)(\.[^/]+)?\z}i,
contributing: %r{\Acontributing[^/]*\z}i,
diff --git a/spec/lib/gitlab/file_detector_spec.rb b/spec/lib/gitlab/file_detector_spec.rb
index f0e7bd28ec0..edab53247e9 100644
--- a/spec/lib/gitlab/file_detector_spec.rb
+++ b/spec/lib/gitlab/file_detector_spec.rb
@@ -15,8 +15,9 @@ describe Gitlab::FileDetector do
describe '.type_of' do
it 'returns the type of a README file' do
- %w(README readme INDEX index).each do |filename|
- %w(.md .adoc).each do |extname|
+ %w[README readme INDEX index].each do |filename|
+ expect(described_class.type_of(filename)).to eq(:readme)
+ %w[.md .adoc .rst].each do |extname|
expect(described_class.type_of(filename + extname)).to eq(:readme)
end
end