Commit e79123fe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve package name regex

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent fbdd411e
...@@ -14,7 +14,7 @@ module EE ...@@ -14,7 +14,7 @@ module EE
end end
def package_name_regex def package_name_regex
@package_name_regex ||= %r{\A(([\w\-\.\@]*)/)*([\w\-\.]*)\z}.freeze @package_name_regex ||= %r{\A\@?(([\w\-\.]*)/)*([\w\-\.]*)\z}.freeze
end end
def maven_path_regex def maven_path_regex
......
...@@ -27,7 +27,9 @@ describe Gitlab::Regex do ...@@ -27,7 +27,9 @@ describe Gitlab::Regex do
it { is_expected.to match('foo') } it { is_expected.to match('foo') }
it { is_expected.to match('foo/bar') } it { is_expected.to match('foo/bar') }
it { is_expected.to match('@foo/bar') } it { is_expected.to match('@foo/bar') }
it { is_expected.to match('com/mycompany/app/my-app') }
it { is_expected.not_to match('$foo/bar') } it { is_expected.not_to match('$foo/bar') }
it { is_expected.not_to match('@foo/@/bar') }
it { is_expected.not_to match('my package name') } it { is_expected.not_to match('my package name') }
it { is_expected.not_to match('!!()()') } it { is_expected.not_to match('!!()()') }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment