summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-05-02 09:13:10 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-05-02 09:13:41 +0200
commitc853dd6158af0f77721ce59c03f5f05e98eeadba (patch)
tree20a68ff2c1092d5655c1f472e67a8890804b3761 /spec
parent2e2a63c8669a084ed3a3aa5e770158ea2cb43a9d (diff)
downloadgitlab-ce-c853dd6158af0f77721ce59c03f5f05e98eeadba.tar.gz
Reuse Gitlab::Regex.full_namespace_regex in the DynamicPathValidator
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/regex_spec.rb4
-rw-r--r--spec/validators/dynamic_path_validator_spec.rb11
2 files changed, 12 insertions, 3 deletions
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index 127cd8c78d8..72e947f2cc2 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -45,8 +45,8 @@ describe Gitlab::Regex, lib: true do
it { is_expected.not_to match('foo-') }
end
- describe 'FULL_NAMESPACE_REGEX_STR' do
- subject { %r{\A#{Gitlab::Regex::FULL_NAMESPACE_REGEX_STR}\z} }
+ describe '.full_namespace_regex' do
+ subject { described_class.full_namespace_regex }
it { is_expected.to match('gitlab.org') }
it { is_expected.to match('gitlab.org/gitlab-git') }
diff --git a/spec/validators/dynamic_path_validator_spec.rb b/spec/validators/dynamic_path_validator_spec.rb
index f43b4892456..4924706b88e 100644
--- a/spec/validators/dynamic_path_validator_spec.rb
+++ b/spec/validators/dynamic_path_validator_spec.rb
@@ -129,6 +129,10 @@ describe DynamicPathValidator do
expect(subject).not_to match('dashboard')
end
+ it 'matches valid paths with a toplevel word in a different place' do
+ expect(subject).to match('parent/dashboard/project-path')
+ end
+
it 'rejects paths containing a wildcard reserved word' do
expect(subject).not_to match('hello/edit')
expect(subject).not_to match('hello/edit/in-the-middle')
@@ -137,7 +141,6 @@ describe DynamicPathValidator do
it 'matches valid paths' do
expect(subject).to match('parent/child/project-path')
- expect(subject).to match('/parent/child/project-path')
end
end
@@ -185,5 +188,11 @@ describe DynamicPathValidator do
expect(described_class.valid?(test_path)).to be_falsey
end
+
+ it 'rejects paths that are in an incorrect format' do
+ test_path = 'incorrect/format.git'
+
+ expect(described_class.valid?(test_path)).to be_falsey
+ end
end
end