summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-11-05 13:58:51 +0100
committerMarin Jankovski <maxlazio@gmail.com>2014-11-05 13:58:51 +0100
commitd59f8abea56be5c9ffdafc77c4d5755161a903a4 (patch)
tree44e4045593283b242467c627421ccaee9f4118dc /spec
parent42a1d8083c77d3803320bbbd0ac1559ff32d2519 (diff)
downloadgitlab-ce-d59f8abea56be5c9ffdafc77c4d5755161a903a4.tar.gz
Fix tests after change to regex validation message.
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/projects_spec.rb5
-rw-r--r--spec/requests/api/users_spec.rb6
2 files changed, 4 insertions, 7 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index cb7a2705573..067935c82a6 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -209,9 +209,8 @@ describe API::API, api: true do
json_response['message']['path'].should == [
'can\'t be blank',
'is too short (minimum is 0 characters)',
- 'can contain only letters, digits, \'_\', \'-\' and \'.\'. It must '\
- 'start with letter, digit or \'_\', optionally preceeded by \'.\'. '\
- 'It must not end in \'.git\'.'
+ 'can contain only letters, digits, \'_\', \'-\' and \'.\'. ' \
+ 'Cannot start with \'-\' or end in \'.git\''
]
end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 3bb6191ed9f..a1a26d80a14 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -141,8 +141,7 @@ describe API::API, api: true do
should == ['must be greater than or equal to 0']
json_response['message']['username'].
should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
end
it "shouldn't available for non admin users" do
@@ -285,8 +284,7 @@ describe API::API, api: true do
should == ['must be greater than or equal to 0']
json_response['message']['username'].
should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ '\'_\', \'-\' and \'.\'. Cannot start with \'-\' or end in \'.git\'']
end
context "with existing user" do