summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-11-05 15:45:54 +0100
committerCiro Santilli <ciro.santilli@gmail.com>2014-11-05 15:49:35 +0100
commit98db90c4c9f33d16f496ebb5fe589d6312f136c4 (patch)
tree2f098cf4ab4507d5e051fb6ef2d4b92020eb5e79 /spec
parentf9814bf28831aeef746cfdc35431c8de45ff7677 (diff)
downloadgitlab-ce-98db90c4c9f33d16f496ebb5fe589d6312f136c4.tar.gz
Factor regex error messages with spec API tests
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/projects_spec.rb6
-rw-r--r--spec/requests/api/users_spec.rb6
2 files changed, 4 insertions, 8 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 067935c82a6..2c4b68c10b6 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -203,14 +203,12 @@ describe API::API, api: true do
json_response['message']['name'].should == [
'can\'t be blank',
'is too short (minimum is 0 characters)',
- 'can contain only letters, digits, \'_\', \'-\' and \'.\' and '\
- 'space. It must start with letter, digit or \'_\'.'
+ Gitlab::Regex.project_regex_message
]
json_response['message']['path'].should == [
'can\'t be blank',
'is too short (minimum is 0 characters)',
- 'can contain only letters, digits, \'_\', \'-\' and \'.\'. ' \
- 'Cannot start with \'-\' or end in \'.git\''
+ Gitlab::Regex.send(:default_regex_message)
]
end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index a1a26d80a14..113a39b870e 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -140,8 +140,7 @@ describe API::API, api: true do
json_response['message']['projects_limit'].
should == ['must be greater than or equal to 0']
json_response['message']['username'].
- should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
+ should == [Gitlab::Regex.send(:default_regex_message)]
end
it "shouldn't available for non admin users" do
@@ -283,8 +282,7 @@ describe API::API, api: true do
json_response['message']['projects_limit'].
should == ['must be greater than or equal to 0']
json_response['message']['username'].
- should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
+ should == [Gitlab::Regex.send(:default_regex_message)]
end
context "with existing user" do