Commit 1dc99b4c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #8251 from cirosantilli/factor-regex-message-spec

Factor regex error messages with spec API tests
parents ae841371 98db90c4
......@@ -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
......
......@@ -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
......
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